5 files changed, 51 insertions, 31 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 05f01fbd9c7f..22a9d8159720 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5835,9 +5835,10 @@ int ext4_mark_iloc_dirty(handle_t *handle,
 {
         int err = 0;
 
-        if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
+        if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) {
+                put_bh(iloc->bh);
                 return -EIO;
-
+        }
         if (IS_I_VERSION(inode))
                 inode_inc_iversion(inode);
 
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 17adcb16a9c8..437f71fe83ae 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -126,6 +126,7 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,
         if (!is_dx_block && type == INDEX) {
                 ext4_error_inode(inode, func, line, block,
                        "directory leaf block found instead of index block");
+                brelse(bh);
                 return ERR_PTR(-EFSCORRUPTED);
         }
         if (!ext4_has_metadata_csum(inode->i_sb) ||
@@ -2811,7 +2812,9 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode)
                         list_del_init(&EXT4_I(inode)->i_orphan);
                         mutex_unlock(&sbi->s_orphan_lock);
                 }
-        }
+        } else
+                brelse(iloc.bh);
+
         jbd_debug(4, "superblock will point to %lu\n", inode->i_ino);
         jbd_debug(4, "orphan inode %lu will point to %d\n",
                         inode->i_ino, NEXT_ORPHAN(inode));
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index ebbc663d0798..a5efee34415f 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -459,16 +459,18 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
 
                 BUFFER_TRACE(bh, "get_write_access");
                 err = ext4_journal_get_write_access(handle, bh);
-                if (err)
+                if (err) {
+                        brelse(bh);
                         return err;
+                }
                 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n",
                            first_cluster, first_cluster - start, count2);
                 ext4_set_bits(bh->b_data, first_cluster - start, count2);
 
                 err = ext4_handle_dirty_metadata(handle, NULL, bh);
+                brelse(bh);
                 if (unlikely(err))
                         return err;
-                brelse(bh);
         }
 
         return 0;
@@ -605,7 +607,6 @@ handle_bb:
                 bh = bclean(handle, sb, block);
                 if (IS_ERR(bh)) {
                         err = PTR_ERR(bh);
-                        bh = NULL;
                         goto out;
                 }
                 overhead = ext4_group_overhead_blocks(sb, group);
@@ -618,9 +619,9 @@ handle_bb:
                 ext4_mark_bitmap_end(EXT4_B2C(sbi, group_data[i].blocks_count),
                                      sb->s_blocksize * 8, bh->b_data);
                 err = ext4_handle_dirty_metadata(handle, NULL, bh);
+                brelse(bh);
                 if (err)
                         goto out;
-                brelse(bh);
 
 handle_ib:
                 if (bg_flags[i] & EXT4_BG_INODE_UNINIT)
@@ -635,18 +636,16 @@ handle_ib:
                 bh = bclean(handle, sb, block);
                 if (IS_ERR(bh)) {
                         err = PTR_ERR(bh);
-                        bh = NULL;
                         goto out;
                 }
 
                 ext4_mark_bitmap_end(EXT4_INODES_PER_GROUP(sb),
                                      sb->s_blocksize * 8, bh->b_data);
                 err = ext4_handle_dirty_metadata(handle, NULL, bh);
+                brelse(bh);
                 if (err)
                         goto out;
-                brelse(bh);
         }
-        bh = NULL;
 
         /* Mark group tables in block bitmap */
         for (j = 0; j < GROUP_TABLE_COUNT; j++) {
@@ -685,7 +684,6 @@ handle_ib:
         }
 
 out:
-        brelse(bh);
         err2 = ext4_journal_stop(handle);
         if (err2 && !err)
                 err = err2;
@@ -873,6 +871,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
         err = ext4_handle_dirty_metadata(handle, NULL, gdb_bh);
         if (unlikely(err)) {
                 ext4_std_error(sb, err);
+                iloc.bh = NULL;
                 goto exit_inode;
         }
         brelse(dind);
@@ -924,6 +923,7 @@ static int add_new_gdb_meta_bg(struct super_block *sb,
                                      sizeof(struct buffer_head *),
                                      GFP_NOFS);
         if (!n_group_desc) {
+                brelse(gdb_bh);
                 err = -ENOMEM;
                 ext4_warning(sb, "not enough memory for %lu groups",
                              gdb_num + 1);
@@ -939,8 +939,6 @@ static int add_new_gdb_meta_bg(struct super_block *sb,
         kvfree(o_group_desc);
         BUFFER_TRACE(gdb_bh, "get_write_access");
         err = ext4_journal_get_write_access(handle, gdb_bh);
-        if (unlikely(err))
-                brelse(gdb_bh);
         return err;
 }
 
@@ -1124,8 +1122,10 @@ static void update_backups(struct super_block *sb, sector_t blk_off, char *data,
                            backup_block, backup_block -
                            ext4_group_first_block_no(sb, group));
                 BUFFER_TRACE(bh, "get_write_access");
-                if ((err = ext4_journal_get_write_access(handle, bh)))
+                if ((err = ext4_journal_get_write_access(handle, bh))) {
+                        brelse(bh);
                         break;
+                }
                 lock_buffer(bh);
                 memcpy(bh->b_data, data, size);
                 if (rest)
@@ -2023,7 +2023,7 @@ retry:
 
         err = ext4_alloc_flex_bg_array(sb, n_group + 1);
         if (err)
-                return err;
+                goto out;
 
         err = ext4_mb_alloc_groupinfo(sb, n_group + 1);
         if (err)
@@ -2059,6 +2059,10 @@ retry:
                 n_blocks_count_retry = 0;
                 free_flex_gd(flex_gd);
                 flex_gd = NULL;
+                if (resize_inode) {
+                        iput(resize_inode);
+                        resize_inode = NULL;
+                }
                 goto retry;
         }
 
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a221f1cdf704..53ff6c2a26ed 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4075,6 +4075,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         sbi->s_groups_count = blocks_count;
         sbi->s_blockfile_groups = min_t(ext4_group_t, sbi->s_groups_count,
                         (EXT4_MAX_BLOCK_FILE_PHYS / EXT4_BLOCKS_PER_GROUP(sb)));
+        if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=
+            le32_to_cpu(es->s_inodes_count)) {
+                ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",
+                         le32_to_cpu(es->s_inodes_count),
+                         ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));
+                ret = -EINVAL;
+                goto failed_mount;
+        }
         db_count = (sbi->s_groups_count + EXT4_DESC_PER_BLOCK(sb) - 1) /
                    EXT4_DESC_PER_BLOCK(sb);
         if (ext4_has_feature_meta_bg(sb)) {
@@ -4094,14 +4102,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 ret = -ENOMEM;
                 goto failed_mount;
         }
-        if (((u64)sbi->s_groups_count * sbi->s_inodes_per_group) !=
-            le32_to_cpu(es->s_inodes_count)) {
-                ext4_msg(sb, KERN_ERR, "inodes count not valid: %u vs %llu",
-                         le32_to_cpu(es->s_inodes_count),
-                         ((u64)sbi->s_groups_count * sbi->s_inodes_per_group));
-                ret = -EINVAL;
-                goto failed_mount;
-        }
 
         bgl_lock_init(sbi->s_blockgroup_lock);
 
@@ -4510,6 +4510,7 @@ failed_mount6:
         percpu_counter_destroy(&sbi->s_freeinodes_counter);
         percpu_counter_destroy(&sbi->s_dirs_counter);
         percpu_counter_destroy(&sbi->s_dirtyclusters_counter);
+        percpu_free_rwsem(&sbi->s_journal_flag_rwsem);
 failed_mount5:
         ext4_ext_release(sb);
         ext4_release_system_zone(sb);
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index f36fc5d5b257..7643d52c776c 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -1031,10 +1031,8 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
         inode_lock(ea_inode);
 
         ret = ext4_reserve_inode_write(handle, ea_inode, &iloc);
-        if (ret) {
-                iloc.bh = NULL;
+        if (ret)
                 goto out;
-        }
 
         ref_count = ext4_xattr_inode_get_ref(ea_inode);
         ref_count += ref_change;
@@ -1080,12 +1078,10 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,
         }
 
         ret = ext4_mark_iloc_dirty(handle, ea_inode, &iloc);
-        iloc.bh = NULL;
         if (ret)
                 ext4_warning_inode(ea_inode,
                                    "ext4_mark_iloc_dirty() failed ret=%d", ret);
 out:
-        brelse(iloc.bh);
         inode_unlock(ea_inode);
         return ret;
 }
@@ -1388,6 +1384,12 @@ retry:
                 bh = ext4_getblk(handle, ea_inode, block, 0);
                 if (IS_ERR(bh))
                         return PTR_ERR(bh);
+                if (!bh) {
+                        WARN_ON_ONCE(1);
+                        EXT4_ERROR_INODE(ea_inode,
+                                         "ext4_getblk() return bh = NULL");
+                        return -EFSCORRUPTED;
+                }
                 ret = ext4_journal_get_write_access(handle, bh);
                 if (ret)
                         goto out;
@@ -2276,8 +2278,10 @@ static struct buffer_head *ext4_xattr_get_block(struct inode *inode)
         if (!bh)
                 return ERR_PTR(-EIO);
         error = ext4_xattr_check_block(inode, bh);
-        if (error)
+        if (error) {
+                brelse(bh);
                 return ERR_PTR(error);
+        }
         return bh;
 }
 
@@ -2397,6 +2401,8 @@ retry_inode:
                         error = ext4_xattr_block_set(handle, inode, &i, &bs);
                 } else if (error == -ENOSPC) {
                         if (EXT4_I(inode)->i_file_acl && !bs.s.base) {
+                                brelse(bs.bh);
+                                bs.bh = NULL;
                                 error = ext4_xattr_block_find(inode, &i, &bs);
                                 if (error)
                                         goto cleanup;
@@ -2617,6 +2623,8 @@ out:
         kfree(buffer);
         if (is)
                 brelse(is->iloc.bh);
+        if (bs)
+                brelse(bs->bh);
         kfree(is);
         kfree(bs);
 
@@ -2696,7 +2704,6 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize,
                                struct ext4_inode *raw_inode, handle_t *handle)
 {
         struct ext4_xattr_ibody_header *header;
-        struct buffer_head *bh;
         struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
         static unsigned int mnt_count;
         size_t min_offs;
@@ -2737,13 +2744,17 @@ retry:
          * EA block can hold new_extra_isize bytes.
          */
         if (EXT4_I(inode)->i_file_acl) {
+                struct buffer_head *bh;
+
                 bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);
                 error = -EIO;
                 if (!bh)
                         goto cleanup;
                 error = ext4_xattr_check_block(inode, bh);
-                if (error)
+                if (error) {
+                        brelse(bh);
                         goto cleanup;
+                }
                 base = BHDR(bh);
                 end = bh->b_data + bh->b_size;
                 min_offs = end - base;