Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / fs / ext4 / block_validity.c

diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 913061c0de1b35f358f2dcbe8ffd5baad7c3ed04..968f163b5febe0583fea3b2557dd0efec7266460 100644 (file)
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -137,6 +137,48 @@ static void debug_print_tree(struct ext4_sb_info *sbi)
        printk(KERN_CONT "\n");
 }
 
+static int ext4_protect_reserved_inode(struct super_block *sb, u32 ino)
+{
+       struct inode *inode;
+       struct ext4_sb_info *sbi = EXT4_SB(sb);
+       struct ext4_map_blocks map;
+       u32 i = 0, err = 0, num, n;
+
+       if ((ino < EXT4_ROOT_INO) ||
+           (ino > le32_to_cpu(sbi->s_es->s_inodes_count)))
+               return -EINVAL;
+       inode = ext4_iget(sb, ino, EXT4_IGET_SPECIAL);
+       if (IS_ERR(inode))
+               return PTR_ERR(inode);
+       num = (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
+       while (i < num) {
+               map.m_lblk = i;
+               map.m_len = num - i;
+               n = ext4_map_blocks(NULL, inode, &map, 0);
+               if (n < 0) {
+                       err = n;
+                       break;
+               }
+               if (n == 0) {
+                       i++;
+               } else {
+                       if (!ext4_data_block_valid(sbi, map.m_pblk, n)) {
+                               ext4_error(sb, "blocks %llu-%llu from inode %u "
+                                          "overlap system zone", map.m_pblk,
+                                          map.m_pblk + map.m_len - 1, ino);
+                               err = -EFSCORRUPTED;
+                               break;
+                       }
+                       err = add_system_zone(sbi, map.m_pblk, n);
+                       if (err < 0)
+                               break;
+                       i += n;
+               }
+       }
+       iput(inode);
+       return err;
+}
+
 int ext4_setup_system_zone(struct super_block *sb)
 {
        ext4_group_t ngroups = ext4_get_groups_count(sb);
@@ -155,6 +197,7 @@ int ext4_setup_system_zone(struct super_block *sb)
                return 0;
 
        for (i=0; i < ngroups; i++) {
+               cond_resched();
                if (ext4_bg_has_super(sb, i) &&
                    ((i < 5) || ((i % flex_size) == 0)))
                        add_system_zone(sbi, ext4_group_first_block_no(sb, i),
@@ -171,6 +214,12 @@ int ext4_setup_system_zone(struct super_block *sb)
                if (ret)
                        return ret;
        }
+       if (ext4_has_feature_journal(sb) && sbi->s_es->s_journal_inum) {
+               ret = ext4_protect_reserved_inode(sb,
+                               le32_to_cpu(sbi->s_es->s_journal_inum));
+               if (ret)
+                       return ret;
+       }
 
        if (test_opt(sb, DEBUG))
                debug_print_tree(sbi);