From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 1/4] xfs: fixup xfs_attr_get_ilocked
Date: Thu, 13 Jul 2017 13:33:01 +0200 [thread overview]
Message-ID: <20170713113304.8079-2-hch@lst.de> (raw)
In-Reply-To: <20170713113304.8079-1-hch@lst.de>
The comment mentioned the wrong lock. Also add an ASSERT to assert
this locking precondition.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_attr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index ef8a1c75a467..de7b9bd30bec 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -114,12 +114,14 @@ xfs_inode_hasattr(
* Overall external interface routines.
*========================================================================*/
-/* Retrieve an extended attribute and its value. Must have iolock. */
+/* Retrieve an extended attribute and its value. Must have ilock. */
int
xfs_attr_get_ilocked(
struct xfs_inode *ip,
struct xfs_da_args *args)
{
+ ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL));
+
if (!xfs_inode_hasattr(ip))
return -ENOATTR;
else if (ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL)
--
2.11.0
next prev parent reply other threads:[~2017-07-13 11:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-13 11:33 fixups for the changes in 4.13 Christoph Hellwig
2017-07-13 11:33 ` Christoph Hellwig [this message]
2017-07-13 19:23 ` [PATCH 1/4] xfs: fixup xfs_attr_get_ilocked Darrick J. Wong
2017-07-13 11:33 ` [PATCH 2/4] xfs: assert locking precondіtion in xfs_attr_list_int_ilocked Christoph Hellwig
2017-07-13 19:23 ` Darrick J. Wong
2017-07-13 11:33 ` [PATCH 3/4] xfs: assert locking precondition in xfs_readlink_bmap_ilocked Christoph Hellwig
2017-07-13 19:23 ` Darrick J. Wong
2017-07-13 11:33 ` [PATCH 4/4] Revert "xfs: grab dquots without taking the ilock" Christoph Hellwig
2017-07-13 16:31 ` Darrick J. Wong
2017-07-13 16:36 ` Christoph Hellwig
2017-07-13 19:22 ` Darrick J. Wong
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=20170713113304.8079-2-hch@lst.de \
--to=hch@lst.de \
--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