| Message ID | 20130628134948.0c822060ccb324debbd1a16d@linux-foundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
NAK. Current code looks ok. On Fri, Jun 28, 2013 at 1:49 PM, Andrew Morton <akpm@linux-foundation.org>wrote: > > Folks, 3.10 is nigh. Could we please have some review and test of this > patch? > > > From: Younger Liu <younger.liu@huawei.com> > Subject: ocfs2: should call ocfs2_journal_access_di() before > ocfs2_delete_entry() in ocfs2_orphan_del() > > While deleting a file into orphan dir in ocfs2_orphan_del(), it calls > ocfs2_delete_entry() before ocfs2_journal_access_di(). If > ocfs2_delete_entry() succeeded and ocfs2_journal_access_di() failed, there > would be a inconsistency: the file is deleted from orphan dir, but orphan > dir dinode is not updated. > > So we need to call ocfs2_journal_access_di() before ocfs2_orphan_del(). > > Signed-off-by: Younger Liu <younger.liu@huawei.com> > Cc: Jie Liu <jeff.liu@oracle.com> > Cc: Joel Becker <jlbec@evilplan.org> > Cc: Mark Fasheh <mfasheh@suse.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > fs/ocfs2/namei.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff -puN > fs/ocfs2/namei.c~ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del > fs/ocfs2/namei.c > --- > a/fs/ocfs2/namei.c~ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del > +++ a/fs/ocfs2/namei.c > @@ -2095,17 +2095,17 @@ int ocfs2_orphan_del(struct ocfs2_super > goto leave; > } > > - /* remove it from the orphan directory */ > - status = ocfs2_delete_entry(handle, orphan_dir_inode, &lookup); > + status = ocfs2_journal_access_di(handle, > + INODE_CACHE(orphan_dir_inode), > + orphan_dir_bh, > + OCFS2_JOURNAL_ACCESS_WRITE); > if (status < 0) { > mlog_errno(status); > goto leave; > } > > - status = ocfs2_journal_access_di(handle, > - INODE_CACHE(orphan_dir_inode), > - orphan_dir_bh, > - OCFS2_JOURNAL_ACCESS_WRITE); > + /* remove it from the orphan directory */ > + status = ocfs2_delete_entry(handle, orphan_dir_inode, &lookup); > if (status < 0) { > mlog_errno(status); > goto leave; > _ > > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > https://oss.oracle.com/mailman/listinfo/ocfs2-devel >
reviewed-by: Jensen <shencanquan@huawei.com> On 2013/6/29 4:49, Andrew Morton wrote: > > Folks, 3.10 is nigh. Could we please have some review and test of this > patch? > > > From: Younger Liu <younger.liu@huawei.com> > Subject: ocfs2: should call ocfs2_journal_access_di() before ocfs2_delete_entry() in ocfs2_orphan_del() > > While deleting a file into orphan dir in ocfs2_orphan_del(), it calls > ocfs2_delete_entry() before ocfs2_journal_access_di(). If > ocfs2_delete_entry() succeeded and ocfs2_journal_access_di() failed, there > would be a inconsistency: the file is deleted from orphan dir, but orphan > dir dinode is not updated. > > So we need to call ocfs2_journal_access_di() before ocfs2_orphan_del(). > > Signed-off-by: Younger Liu <younger.liu@huawei.com> > Cc: Jie Liu <jeff.liu@oracle.com> > Cc: Joel Becker <jlbec@evilplan.org> > Cc: Mark Fasheh <mfasheh@suse.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > --- > > fs/ocfs2/namei.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff -puN fs/ocfs2/namei.c~ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del fs/ocfs2/namei.c > --- a/fs/ocfs2/namei.c~ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del > +++ a/fs/ocfs2/namei.c > @@ -2095,17 +2095,17 @@ int ocfs2_orphan_del(struct ocfs2_super > goto leave; > } > > - /* remove it from the orphan directory */ > - status = ocfs2_delete_entry(handle, orphan_dir_inode, &lookup); > + status = ocfs2_journal_access_di(handle, > + INODE_CACHE(orphan_dir_inode), > + orphan_dir_bh, > + OCFS2_JOURNAL_ACCESS_WRITE); > if (status < 0) { > mlog_errno(status); > goto leave; > } > > - status = ocfs2_journal_access_di(handle, > - INODE_CACHE(orphan_dir_inode), > - orphan_dir_bh, > - OCFS2_JOURNAL_ACCESS_WRITE); > + /* remove it from the orphan directory */ > + status = ocfs2_delete_entry(handle, orphan_dir_inode, &lookup); > if (status < 0) { > mlog_errno(status); > goto leave; > _ > > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel@oss.oracle.com > https://oss.oracle.com/mailman/listinfo/ocfs2-devel > >
diff -puN fs/ocfs2/namei.c~ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del fs/ocfs2/namei.c --- a/fs/ocfs2/namei.c~ocfs2-should-call-ocfs2_journal_access_di-before-ocfs2_delete_entry-in-ocfs2_orphan_del +++ a/fs/ocfs2/namei.c @@ -2095,17 +2095,17 @@ int ocfs2_orphan_del(struct ocfs2_super goto leave; } - /* remove it from the orphan directory */ - status = ocfs2_delete_entry(handle, orphan_dir_inode, &lookup); + status = ocfs2_journal_access_di(handle, + INODE_CACHE(orphan_dir_inode), + orphan_dir_bh, + OCFS2_JOURNAL_ACCESS_WRITE); if (status < 0) { mlog_errno(status); goto leave; } - status = ocfs2_journal_access_di(handle, - INODE_CACHE(orphan_dir_inode), - orphan_dir_bh, - OCFS2_JOURNAL_ACCESS_WRITE); + /* remove it from the orphan directory */ + status = ocfs2_delete_entry(handle, orphan_dir_inode, &lookup); if (status < 0) { mlog_errno(status); goto leave;