1 ext4: release bh in make_indexed_dir
3 From: gmail <yngsion@gmail.com>
5 The commit 6050d47adcad: "ext4: bail out from make_indexed_dir() on
6 first error" could end up leaking bh2 in the error path.
8 [ Also avoid renaming bh2 to bh, which just confuses things --tytso ]
10 Signed-off-by: yangsheng <yngsion@gmail.com>
11 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
13 fs/ext4/namei.c | 14 ++++++--------
14 1 file changed, 6 insertions(+), 8 deletions(-)
16 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
17 index 2243ae2..c344b81 100644
20 @@ -2044,33 +2044,31 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
21 frame->entries = entries;
26 retval = ext4_handle_dirty_dx_node(handle, dir, frame->bh);
29 - retval = ext4_handle_dirty_dirent_node(handle, dir, bh);
30 + retval = ext4_handle_dirty_dirent_node(handle, dir, bh2);
34 - de = do_split(handle,dir, &bh, frame, &fname->hinfo);
35 + de = do_split(handle,dir, &bh2, frame, &fname->hinfo);
42 - retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh);
45 + retval = add_dirent_to_buf(handle, fname, dir, inode, de, bh2);
48 * Even if the block split failed, we have to properly write
49 * out all the changes we did so far. Otherwise we can end up
50 * with corrupted filesystem.
52 - ext4_mark_inode_dirty(handle, dir);
54 + ext4_mark_inode_dirty(handle, dir);