From: Dave Chinner <david@fromorbit.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v9 05/28] xfs: Hold inode locks in xfs_ialloc
Date: Sat, 6 Oct 2018 12:53:20 +1000 [thread overview]
Message-ID: <20181006025320.GC17046@dastard> (raw)
In-Reply-To: <1537956907-10244-6-git-send-email-allison.henderson@oracle.com>
On Wed, Sep 26, 2018 at 03:14:44AM -0700, Allison Henderson wrote:
> Modify xfs_ialloc 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>
> ---
> fs/xfs/xfs_inode.c | 6 +++++-
> fs/xfs/xfs_qm.c | 1 +
> fs/xfs/xfs_symlink.c | 3 +++
> 3 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index d957a46..1ef9d03 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -744,6 +744,8 @@ xfs_lookup(
> * to attach to or associate with (i.e. pip == NULL) because they
> * are not linked into the directory structure - they are attached
> * directly to the superblock - and so have no parent.
> + *
> + * Caller is responsible for unlocking the inode manually upon return
> */
> static int
> xfs_ialloc(
> @@ -942,7 +944,7 @@ xfs_ialloc(
> /*
> * Log the new values stuffed into the inode.
> */
> - xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
> + xfs_trans_ijoin(tp, ip, 0);
> xfs_trans_log_inode(tp, ip, flags);
>
> /* now that we have an i_mode we can setup the inode structure */
> @@ -1264,6 +1266,7 @@ xfs_create(
> xfs_qm_dqrele(pdqp);
>
> *ipp = ip;
> + xfs_iunlock(ip, XFS_ILOCK_EXCL);
> return 0;
>
> out_trans_cancel:
> @@ -1359,6 +1362,7 @@ xfs_create_tmpfile(
> xfs_qm_dqrele(pdqp);
>
> *ipp = ip;
> + xfs_iunlock(ip, XFS_ILOCK_EXCL);
> return 0;
>
> out_trans_cancel:
It looks like the error paths that get run after a successful call
to xfs_dir_ialloc() don't unlock the inode correctly.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
next prev parent reply other threads:[~2018-10-06 9:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-26 10:14 [PATCH v9 00/28] Parent Pointers v9 Allison Henderson
2018-09-26 10:14 ` [PATCH v9 01/28] xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h Allison Henderson
2018-09-26 10:14 ` [PATCH v9 02/28] xfs: Add helper function xfs_attr_try_sf_addname Allison Henderson
2018-10-06 3:01 ` Darrick J. Wong
2018-10-06 3:13 ` Dave Chinner
2018-09-26 10:14 ` [PATCH v9 03/28] xfs: Add attibute set and helper functions Allison Henderson
2018-10-06 2:51 ` Dave Chinner
2018-09-26 10:14 ` [PATCH v9 04/28] xfs: Add attibute remove " Allison Henderson
2018-09-26 10:14 ` [PATCH v9 05/28] xfs: Hold inode locks in xfs_ialloc Allison Henderson
2018-10-06 2:53 ` Dave Chinner [this message]
2018-09-26 10:14 ` [PATCH v9 06/28] xfs: Add trans toggle to attr routines Allison Henderson
2018-09-26 10:14 ` [PATCH v9 07/28] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2018-09-26 10:14 ` [PATCH v9 08/28] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2018-09-26 10:14 ` [PATCH v9 09/28] xfs: Add xfs_has_attr and subroutines Allison Henderson
2018-09-26 10:14 ` [PATCH v9 10/28] xfs: Add attr context to log item Allison Henderson
2018-09-26 10:14 ` [PATCH v9 11/28] xfs: Roll delayed attr operations by returning EAGAIN Allison Henderson
2018-09-26 10:14 ` [PATCH v9 12/28] xfs: Remove roll_trans boolean Allison Henderson
2018-09-26 10:14 ` [PATCH v9 13/28] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names Allison Henderson
2018-09-26 10:14 ` [PATCH v9 14/28] xfs: get directory offset when adding directory name Allison Henderson
2018-09-26 10:14 ` [PATCH v9 15/28] xfs: get directory offset when removing " Allison Henderson
2018-09-26 10:14 ` [PATCH v9 16/28] xfs: get directory offset when replacing a " Allison Henderson
2018-09-26 10:14 ` [PATCH v9 17/28] xfs: add parent pointer support to attribute code Allison Henderson
2018-09-26 10:14 ` [PATCH v9 18/28] xfs: define parent pointer xattr format Allison Henderson
2018-09-26 10:14 ` [PATCH v9 19/28] xfs: extent transaction reservations for parent attributes Allison Henderson
2018-09-26 10:14 ` [PATCH v9 20/28] xfs: parent pointer attribute creation Allison Henderson
2018-09-26 10:15 ` [PATCH v9 21/28] xfs: add parent attributes to link Allison Henderson
2018-09-26 10:15 ` [PATCH v9 22/28] xfs: remove parent pointers in unlink Allison Henderson
2018-09-26 10:15 ` [PATCH v9 23/28] xfs: Add parent pointers to rename Allison Henderson
2018-09-26 10:15 ` [PATCH v9 24/28] xfs: Add the parent pointer support to the superblock version 5 Allison Henderson
2018-09-26 10:15 ` [PATCH v9 25/28] xfs: Add helper function xfs_attr_list_context_init Allison Henderson
2018-09-26 10:15 ` [PATCH v9 26/28] xfs: Increase XFS_DEFER_OPS_NR_INODES to 4 Allison Henderson
2018-09-26 10:15 ` [PATCH v9 27/28] xfs: Add parent pointer ioctl Allison Henderson
2018-09-26 10:15 ` [PATCH v9 28/28] xfs: Add delayed attributes error tag 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=20181006025320.GC17046@dastard \
--to=david@fromorbit.com \
--cc=allison.henderson@oracle.com \
--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).