ext4: fix double unlock buffer mess during fs-resize

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / resize.c

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 5932ab5ca53f4c2f70d027be8e361f6dc1fd01a3..f21fdbf5c75df946f7dcf64e1d29e87ff42061b9 100644 (file)
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1049,8 +1049,6 @@ static void update_backups(struct super_block *sb, int blk_off, char *data,
                goto exit_err;
        }
 
-       ext4_superblock_csum_set(sb, (struct ext4_super_block *)data);
-
        if (meta_bg == 0) {
                group = ext4_list_backups(sb, &three, &five, &seven);
                last = sbi->s_groups_count;
@@ -1183,17 +1181,12 @@ static struct buffer_head *ext4_get_bitmap(struct super_block *sb, __u64 block)
        struct buffer_head *bh = sb_getblk(sb, block);
        if (!bh)
                return NULL;
-
-       if (bitmap_uptodate(bh))
-               return bh;
-
-       lock_buffer(bh);
-       if (bh_submit_read(bh) < 0) {
-               unlock_buffer(bh);
-               brelse(bh);
-               return NULL;
+       if (!bh_uptodate_or_lock(bh)) {
+               if (bh_submit_read(bh) < 0) {
+                       brelse(bh);
+                       return NULL;
+               }
        }
-       unlock_buffer(bh);
 
        return bh;
 }
@@ -1772,23 +1765,18 @@ static int ext4_convert_meta_bg(struct super_block *sb, struct inode *inode)
        handle_t *handle;
        struct ext4_sb_info *sbi = EXT4_SB(sb);
        struct ext4_super_block *es = sbi->s_es;
-       struct ext4_inode_info *ei = 0;
+       struct ext4_inode_info *ei = EXT4_I(inode);
        ext4_fsblk_t nr;
        int i, ret, err = 0;
        int credits = 1;
 
        ext4_msg(sb, KERN_INFO, "Converting file system to meta_bg");
-       if (EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_RESIZE_INODE)) {
+       if (inode) {
                if (es->s_reserved_gdt_blocks) {
                        ext4_error(sb, "Unexpected non-zero "
                                   "s_reserved_gdt_blocks");
                        return -EPERM;
                }
-               if (!inode) {
-                       ext4_error(sb, "Unexpected NULL resize_inode");
-                       return -EPERM;
-               }
-               ei = EXT4_I(inode);
 
                /* Do a quick sanity check of the resize inode */
                if (inode->i_blocks != 1 << (inode->i_blkbits - 9))
@@ -1869,15 +1857,23 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
        ext4_group_t n_group;
        ext4_fsblk_t o_blocks_count;
        ext4_fsblk_t n_blocks_count_retry = 0;
+       unsigned long last_update_time = 0;
        int err = 0, flexbg_size = 1 << sbi->s_log_groups_per_flex;
        int meta_bg;
 
+       /* See if the device is actually as big as what was requested */
+       bh = sb_bread(sb, n_blocks_count - 1);
+       if (!bh) {
+               ext4_warning(sb, "can't read last block, resize aborted");
+               return -ENOSPC;
+       }
+       brelse(bh);
+
 retry:
        o_blocks_count = ext4_blocks_count(es);
 
-       if (test_opt(sb, DEBUG))
-               ext4_msg(sb, KERN_DEBUG, "resizing filesystem from %llu "
-                      "to %llu blocks", o_blocks_count, n_blocks_count);
+       ext4_msg(sb, KERN_INFO, "resizing filesystem from %llu "
+                "to %llu blocks", o_blocks_count, n_blocks_count);
 
        if (n_blocks_count < o_blocks_count) {
                /* On-line shrinking not supported */
@@ -1921,7 +1917,7 @@ retry:
                }
        }
 
-       if ((!resize_inode && !meta_bg) || n_group == o_group) {
+       if ((!resize_inode && !meta_bg) || n_blocks_count == o_blocks_count) {
                err = ext4_convert_meta_bg(sb, resize_inode);
                if (err)
                        goto out;
@@ -1936,14 +1932,6 @@ retry:
                }
        }
 
-       /* See if the device is actually as big as what was requested */
-       bh = sb_bread(sb, n_blocks_count - 1);
-       if (!bh) {
-               ext4_warning(sb, "can't read last block, resize aborted");
-               return -ENOSPC;
-       }
-       brelse(bh);
-
        /* extend the last group */
        if (n_group == o_group)
                add = n_blocks_count - o_blocks_count;
@@ -1977,6 +1965,13 @@ retry:
         */
        while (ext4_setup_next_flex_gd(sb, flex_gd, n_blocks_count,
                                              flexbg_size)) {
+               if (jiffies - last_update_time > HZ * 10) {
+                       if (last_update_time)
+                               ext4_msg(sb, KERN_INFO,
+                                        "resized to %llu blocks",
+                                        ext4_blocks_count(es));
+                       last_update_time = jiffies;
+               }
                if (ext4_alloc_group_tables(sb, flex_gd, flexbg_size) != 0)
                        break;
                err = ext4_flex_group_add(sb, resize_inode, flex_gd);
@@ -1997,8 +1992,6 @@ out:
                free_flex_gd(flex_gd);
        if (resize_inode != NULL)
                iput(resize_inode);
-       if (test_opt(sb, DEBUG))
-               ext4_msg(sb, KERN_DEBUG, "resized filesystem to %llu",
-                        n_blocks_count);
+       ext4_msg(sb, KERN_INFO, "resized filesystem to %llu", n_blocks_count);
        return err;
 }