From: Allison Henderson <allison.henderson@oracle.com>
To: "djwong@kernel.org" <djwong@kernel.org>
Cc: "linux-xfs@vger.kernel.org" <linux-xfs@vger.kernel.org>
Subject: Re: [PATCH v3 04/26] xfs: Hold inode locks in xfs_trans_alloc_dir
Date: Fri, 23 Sep 2022 20:44:06 +0000 [thread overview]
Message-ID: <30635d0fdc31146c43d6b1b071ba13efd86ff312.camel@oracle.com> (raw)
In-Reply-To: <Yy4DRQ8MDJBmuntO@magnolia>
On Fri, 2022-09-23 at 12:04 -0700, Darrick J. Wong wrote:
> On Wed, Sep 21, 2022 at 10:44:36PM -0700,
> allison.henderson@oracle.com wrote:
> > From: Allison Henderson <allison.henderson@oracle.com>
> >
> > Modify xfs_trans_alloc_dir to hold locks after return. Caller will
> > be
> > responsible for manual unlock. We will need this later to hold
> > locks
> > across parent pointer operations
> >
> > Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>
> Looks ok,
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Great, thanks!
Allison
>
> --D
>
> > ---
> > fs/xfs/xfs_inode.c | 14 ++++++++++++--
> > fs/xfs/xfs_trans.c | 6 ++++--
> > 2 files changed, 16 insertions(+), 4 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > index f21f625b428e..9a3174a8f895 100644
> > --- a/fs/xfs/xfs_inode.c
> > +++ b/fs/xfs/xfs_inode.c
> > @@ -1277,10 +1277,15 @@ xfs_link(
> > if (xfs_has_wsync(mp) || xfs_has_dirsync(mp))
> > xfs_trans_set_sync(tp);
> >
> > - return xfs_trans_commit(tp);
> > + error = xfs_trans_commit(tp);
> > + xfs_iunlock(tdp, XFS_ILOCK_EXCL);
> > + xfs_iunlock(sip, XFS_ILOCK_EXCL);
> > + return error;
> >
> > error_return:
> > xfs_trans_cancel(tp);
> > + xfs_iunlock(tdp, XFS_ILOCK_EXCL);
> > + xfs_iunlock(sip, XFS_ILOCK_EXCL);
> > std_return:
> > if (error == -ENOSPC && nospace_error)
> > error = nospace_error;
> > @@ -2516,15 +2521,20 @@ xfs_remove(
> >
> > error = xfs_trans_commit(tp);
> > if (error)
> > - goto std_return;
> > + goto out_unlock;
> >
> > if (is_dir && xfs_inode_is_filestream(ip))
> > xfs_filestream_deassociate(ip);
> >
> > + xfs_iunlock(ip, XFS_ILOCK_EXCL);
> > + xfs_iunlock(dp, XFS_ILOCK_EXCL);
> > return 0;
> >
> > out_trans_cancel:
> > xfs_trans_cancel(tp);
> > + out_unlock:
> > + xfs_iunlock(ip, XFS_ILOCK_EXCL);
> > + xfs_iunlock(dp, XFS_ILOCK_EXCL);
> > std_return:
> > return error;
> > }
> > diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> > index 7bd16fbff534..ac98ff416e54 100644
> > --- a/fs/xfs/xfs_trans.c
> > +++ b/fs/xfs/xfs_trans.c
> > @@ -1356,6 +1356,8 @@ xfs_trans_alloc_ichange(
> > * The caller must ensure that the on-disk dquots attached to this
> > inode have
> > * already been allocated and initialized. The ILOCKs will be
> > dropped when the
> > * transaction is committed or cancelled.
> > + *
> > + * Caller is responsible for unlocking the inodes manually upon
> > return
> > */
> > int
> > xfs_trans_alloc_dir(
> > @@ -1386,8 +1388,8 @@ xfs_trans_alloc_dir(
> >
> > xfs_lock_two_inodes(dp, XFS_ILOCK_EXCL, ip,
> > XFS_ILOCK_EXCL);
> >
> > - xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
> > - xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
> > + xfs_trans_ijoin(tp, dp, 0);
> > + xfs_trans_ijoin(tp, ip, 0);
> >
> > error = xfs_qm_dqattach_locked(dp, false);
> > if (error) {
> > --
> > 2.25.1
> >
next prev parent reply other threads:[~2022-09-23 20:47 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 5:44 [PATCH v3 00/26] Parent Pointers allison.henderson
2022-09-22 5:44 ` [PATCH v3 01/26] xfs: Add new name to attri/d allison.henderson
2022-09-23 18:53 ` Darrick J. Wong
2022-09-23 20:43 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 02/26] xfs: Increase XFS_DEFER_OPS_NR_INODES to 5 allison.henderson
2022-09-23 19:02 ` Darrick J. Wong
2022-09-23 20:45 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 03/26] xfs: Hold inode locks in xfs_ialloc allison.henderson
2022-09-22 5:44 ` [PATCH v3 04/26] xfs: Hold inode locks in xfs_trans_alloc_dir allison.henderson
2022-09-23 19:04 ` Darrick J. Wong
2022-09-23 20:44 ` Allison Henderson [this message]
2022-09-22 5:44 ` [PATCH v3 05/26] xfs: Hold inode locks in xfs_rename allison.henderson
2022-09-23 19:21 ` Darrick J. Wong
2022-09-23 20:44 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 06/26] xfs: Expose init_xattrs in xfs_create_tmpfile allison.henderson
2022-09-23 19:25 ` Darrick J. Wong
2022-09-23 20:45 ` Allison Henderson
2022-09-23 21:18 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 07/26] xfs: get directory offset when adding directory name allison.henderson
2022-09-22 5:44 ` [PATCH v3 08/26] xfs: get directory offset when removing " allison.henderson
2022-09-22 5:44 ` [PATCH v3 09/26] xfs: get directory offset when replacing a " allison.henderson
2022-09-22 5:44 ` [PATCH v3 10/26] xfs: add parent pointer support to attribute code allison.henderson
2022-09-22 5:44 ` [PATCH v3 11/26] xfs: define parent pointer xattr format allison.henderson
2022-09-22 5:44 ` [PATCH v3 12/26] xfs: Add xfs_verify_pptr allison.henderson
2022-09-22 5:44 ` [PATCH v3 13/26] xfs: extend transaction reservations for parent attributes allison.henderson
2022-09-23 20:17 ` Darrick J. Wong
2022-09-23 23:53 ` Allison Henderson
2022-09-26 23:53 ` Darrick J. Wong
2022-09-27 20:04 ` Allison Henderson
2022-09-27 20:44 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 14/26] xfs: parent pointer attribute creation allison.henderson
2022-09-23 21:11 ` Darrick J. Wong
2022-09-26 21:48 ` Allison Henderson
2022-09-26 23:54 ` Darrick J. Wong
2022-09-27 20:10 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 15/26] xfs: add parent attributes to link allison.henderson
2022-09-23 20:31 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-26 23:55 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 16/26] xfs: add parent attributes to symlink allison.henderson
2022-09-23 21:16 ` Darrick J. Wong
2022-09-26 21:48 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 17/26] xfs: remove parent pointers in unlink allison.henderson
2022-09-23 21:22 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 18/26] xfs: Add parent pointers to xfs_cross_rename allison.henderson
2022-09-23 21:52 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 19/26] xfs: Indent xfs_rename allison.henderson
2022-09-23 21:22 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 20/26] xfs: Add parent pointers to rename allison.henderson
2022-09-23 22:08 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-22 5:44 ` [PATCH v3 21/26] xfs: Add the parent pointer support to the superblock version 5 allison.henderson
2022-09-22 5:44 ` [PATCH v3 22/26] xfs: Add helper function xfs_attr_list_context_init allison.henderson
2022-09-22 5:44 ` [PATCH v3 23/26] xfs: Filter XFS_ATTR_PARENT for getfattr allison.henderson
2022-09-22 16:55 ` Allison Henderson
2022-09-23 21:45 ` Darrick J. Wong
2022-09-26 21:49 ` Allison Henderson
2022-09-27 18:32 ` Darrick J. Wong
2022-09-28 18:22 ` Allison Henderson
2022-09-28 1:13 ` [xfs] b73248c4ee: xfstests.xfs.269.fail kernel test robot
2022-09-22 5:44 ` [PATCH v3 24/26] xfs: Add parent pointer ioctl allison.henderson
2022-09-24 0:30 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-27 18:34 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 25/26] xfs: fix unit conversion error in xfs_log_calc_max_attrsetm_res allison.henderson
2022-09-23 21:47 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
2022-09-27 0:02 ` Darrick J. Wong
2022-09-22 5:44 ` [PATCH v3 26/26] xfs: drop compatibility minimum log size computations for reflink allison.henderson
2022-09-23 21:48 ` Darrick J. Wong
2022-09-26 21:50 ` Allison Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30635d0fdc31146c43d6b1b071ba13efd86ff312.camel@oracle.com \
--to=allison.henderson@oracle.com \
--cc=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).