From: Darrick J. Wong Date: Wed, 31 Aug 2011 15:58:51 +0000 (-0400) Subject: ext4: ext4_rename should dirty dir_bh with the correct directory X-Git-Tag: v3.1.1~96 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=76e72d11365ce08b2800ac70b7abc0d46ee9727d;p=karo-tx-linux.git ext4: ext4_rename should dirty dir_bh with the correct directory commit bcaa992975041e40449be8c010c26192b8c8b409 upstream. When ext4_rename performs a directory rename (move), dir_bh is a buffer that is modified to update the '..' link in the directory being moved (old_inode). However, ext4_handle_dirty_metadata is called with the old parent directory inode (old_dir) and dir_bh, which is incorrect because dir_bh does not belong to the parent inode. Fix this error. Signed-off-by: Darrick J. Wong Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1c924faeb6c8..46df9a984bbf 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2530,7 +2530,7 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, PARENT_INO(dir_bh->b_data, new_dir->i_sb->s_blocksize) = cpu_to_le32(new_dir->i_ino); BUFFER_TRACE(dir_bh, "call ext4_handle_dirty_metadata"); - retval = ext4_handle_dirty_metadata(handle, old_dir, dir_bh); + retval = ext4_handle_dirty_metadata(handle, old_inode, dir_bh); if (retval) { ext4_std_error(old_dir->i_sb, retval); goto end_rename;