2011-08-17 03:35:46

by djwong

Subject: [PATCH] ext4_rename should dirty dir_bh with the correct directory

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 <[email protected]>
---

fs/ext4/namei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 79ddc43..2b5c34b 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2538,7 +2538,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;

2011-08-21 18:15:59

by Theodore Ts'o

Subject: Re: [PATCH] ext4_rename should dirty dir_bh with the correct directory

On Tue, Aug 16, 2011 at 08:35:44PM -0700, Darrick J. Wong wrote:
> 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 <[email protected]>

Signed-off-by: "Theodore Ts'o" <[email protected]>

Added to the ext4 tree, thanks.

- Ted