| Message ID | 1340379514-2838-1-git-send-email-tm@tao.ma |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Jun 22, 2012 at 11:38:34PM +0800, Tao Ma wrote: > From: Tao Ma <boyu.mt@taobao.com> > > In ext4_rename, when the old name is a dir, we need to > change ".." to its new parent and journal the change, so > with metadata_csum enabled, we have to re-calc the csum. > > As the first block of the dir can be either a htree root > or a normal directory block and we have different csum > calculation for these 2 types, we have to choose the right > one in ext4_rename. > > btw, it is found by xfstests 013. Good catch! Acked-by: Darrick J. Wong <djwong@us.ibm.com> --D > > Cc: "Theodore Ts'o" <tytso@mit.edu> > Signed-off-by: Tao Ma <boyu.mt@taobao.com> > --- > fs/ext4/namei.c | 11 +++++++++-- > 1 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c > index 5845cd9..0edaf18 100644 > --- a/fs/ext4/namei.c > +++ b/fs/ext4/namei.c > @@ -2918,8 +2918,15 @@ 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_dirent_node(handle, old_inode, > - dir_bh); > + if (is_dx(old_inode)) { > + retval = ext4_handle_dirty_dx_node(handle, > + old_inode, > + dir_bh); > + } else { > + retval = ext4_handle_dirty_dirent_node(handle, > + old_inode, > + dir_bh); > + } > if (retval) { > ext4_std_error(old_dir->i_sb, retval); > goto end_rename; > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 03, 2012 at 10:01:53AM -0700, Darrick J. Wong wrote: > On Fri, Jun 22, 2012 at 11:38:34PM +0800, Tao Ma wrote: > > From: Tao Ma <boyu.mt@taobao.com> > > > > In ext4_rename, when the old name is a dir, we need to > > change ".." to its new parent and journal the change, so > > with metadata_csum enabled, we have to re-calc the csum. > > > > As the first block of the dir can be either a htree root > > or a normal directory block and we have different csum > > calculation for these 2 types, we have to choose the right > > one in ext4_rename. > > > > btw, it is found by xfstests 013. > > Good catch! > > Acked-by: Darrick J. Wong <djwong@us.ibm.com> Thanks, applied. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 5845cd9..0edaf18 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2918,8 +2918,15 @@ 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_dirent_node(handle, old_inode, - dir_bh); + if (is_dx(old_inode)) { + retval = ext4_handle_dirty_dx_node(handle, + old_inode, + dir_bh); + } else { + retval = ext4_handle_dirty_dirent_node(handle, + old_inode, + dir_bh); + } if (retval) { ext4_std_error(old_dir->i_sb, retval); goto end_rename;