From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: Dave Chinner <dchinner@redhat.com>,
Chandan Rajendra <chandanrlinux@gmail.com>,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH 12/30] xfs: remove the xfs_inode argument to xfs_attr_get_ilocked
Date: Tue, 25 Feb 2020 15:09:54 -0800 [thread overview]
Message-ID: <20200225231012.735245-13-hch@lst.de> (raw)
In-Reply-To: <20200225231012.735245-1-hch@lst.de>
The inode can easily be derived from the args structure. Also
don't bother with else statements after early returns.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_attr.c | 15 +++++++--------
fs/xfs/libxfs/xfs_attr.h | 2 +-
fs/xfs/scrub/attr.c | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 288b39e81efd..fd095e3d4a9a 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -77,19 +77,18 @@ xfs_inode_hasattr(
*/
int
xfs_attr_get_ilocked(
- struct xfs_inode *ip,
struct xfs_da_args *args)
{
- ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL));
+ ASSERT(xfs_isilocked(args->dp, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL));
- if (!xfs_inode_hasattr(ip))
+ if (!xfs_inode_hasattr(args->dp))
return -ENOATTR;
- else if (ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL)
+
+ if (args->dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL)
return xfs_attr_shortform_getvalue(args);
- else if (xfs_bmap_one_block(ip, XFS_ATTR_FORK))
+ if (xfs_bmap_one_block(args->dp, XFS_ATTR_FORK))
return xfs_attr_leaf_get(args);
- else
- return xfs_attr_node_get(args);
+ return xfs_attr_node_get(args);
}
/*
@@ -133,7 +132,7 @@ xfs_attr_get(
args->op_flags |= XFS_DA_OP_ALLOCVAL;
lock_mode = xfs_ilock_attr_map_shared(args->dp);
- error = xfs_attr_get_ilocked(args->dp, args);
+ error = xfs_attr_get_ilocked(args);
xfs_iunlock(args->dp, lock_mode);
/* on error, we have to clean up allocated value buffers */
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index be77d13a2902..b8c4ed27f626 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -145,7 +145,7 @@ int xfs_attr_inactive(struct xfs_inode *dp);
int xfs_attr_list_int_ilocked(struct xfs_attr_list_context *);
int xfs_attr_list_int(struct xfs_attr_list_context *);
int xfs_inode_hasattr(struct xfs_inode *ip);
-int xfs_attr_get_ilocked(struct xfs_inode *ip, struct xfs_da_args *args);
+int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args);
int xfs_attr_set_args(struct xfs_da_args *args);
diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index d804558cdbca..f983c2b969e0 100644
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -162,7 +162,7 @@ xchk_xattr_listent(
args.value = xchk_xattr_valuebuf(sx->sc);
args.valuelen = valuelen;
- error = xfs_attr_get_ilocked(context->dp, &args);
+ error = xfs_attr_get_ilocked(&args);
if (!xchk_fblock_process_error(sx->sc, XFS_ATTR_FORK, args.blkno,
&error))
goto fail_xref;
--
2.24.1
next prev parent reply other threads:[~2020-02-25 23:10 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 23:09 clean up the attr interface v6 Christoph Hellwig
2020-02-25 23:09 ` [PATCH 01/30] xfs: reject invalid flags combinations in XFS_IOC_ATTRLIST_BY_HANDLE Christoph Hellwig
2020-02-25 23:09 ` [PATCH 02/30] xfs: remove the ATTR_INCOMPLETE flag Christoph Hellwig
2020-02-25 23:09 ` [PATCH 03/30] xfs: merge xfs_attr_remove into xfs_attr_set Christoph Hellwig
2020-02-26 16:24 ` Darrick J. Wong
2020-02-25 23:09 ` [PATCH 04/30] xfs: merge xfs_attrmulti_attr_remove into xfs_attrmulti_attr_set Christoph Hellwig
2020-02-25 23:09 ` [PATCH 05/30] xfs: use strndup_user in XFS_IOC_ATTRMULTI_BY_HANDLE Christoph Hellwig
2020-02-25 23:51 ` Dave Chinner
2020-02-25 23:09 ` [PATCH 06/30] xfs: factor out a helper for a single XFS_IOC_ATTRMULTI_BY_HANDLE op Christoph Hellwig
2020-02-25 23:55 ` Dave Chinner
2020-02-25 23:09 ` [PATCH 07/30] xfs: remove the name == NULL check from xfs_attr_args_init Christoph Hellwig
2020-02-25 23:09 ` [PATCH 08/30] xfs: remove the MAXNAMELEN " Christoph Hellwig
2020-02-25 23:09 ` [PATCH 09/30] xfs: turn xfs_da_args.value into a void pointer Christoph Hellwig
2020-02-25 23:55 ` Dave Chinner
2020-02-25 23:09 ` [PATCH 10/30] xfs: pass an initialized xfs_da_args structure to xfs_attr_set Christoph Hellwig
2020-02-26 0:21 ` Dave Chinner
2020-02-26 15:07 ` Christoph Hellwig
2020-02-25 23:09 ` [PATCH 11/30] xfs: pass an initialized xfs_da_args to xfs_attr_get Christoph Hellwig
2020-02-26 0:33 ` Dave Chinner
2020-02-26 15:10 ` Christoph Hellwig
2020-02-25 23:09 ` Christoph Hellwig [this message]
2020-02-25 23:09 ` [PATCH 13/30] xfs: remove ATTR_KERNOVAL Christoph Hellwig
2020-02-25 23:09 ` [PATCH 14/30] xfs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Christoph Hellwig
2020-02-25 23:09 ` [PATCH 15/30] xfs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Christoph Hellwig
2020-02-25 23:09 ` [PATCH 16/30] xfs: factor out a xfs_attr_match helper Christoph Hellwig
2020-02-25 23:09 ` [PATCH 17/30] xfs: cleanup struct xfs_attr_list_context Christoph Hellwig
2020-02-25 23:10 ` [PATCH 18/30] xfs: remove the unused ATTR_ENTRY macro Christoph Hellwig
2020-02-25 23:10 ` [PATCH 19/30] xfs: open code ATTR_ENTSIZE Christoph Hellwig
2020-02-25 23:10 ` [PATCH 20/30] xfs: move the legacy xfs_attr_list to xfs_ioctl.c Christoph Hellwig
2020-02-25 23:10 ` [PATCH 21/30] xfs: rename xfs_attr_list_int to xfs_attr_list Christoph Hellwig
2020-02-25 23:10 ` [PATCH 22/30] xfs: lift common checks into xfs_ioc_attr_list Christoph Hellwig
2020-02-25 23:10 ` [PATCH 23/30] xfs: lift buffer allocation " Christoph Hellwig
2020-02-25 23:10 ` [PATCH 24/30] xfs: lift cursor copy in/out " Christoph Hellwig
2020-02-25 23:10 ` [PATCH 25/30] xfs: improve xfs_forget_acl Christoph Hellwig
2020-02-25 23:10 ` [PATCH 26/30] xfs: clean up the ATTR_REPLACE checks Christoph Hellwig
2020-02-26 0:36 ` Dave Chinner
2020-02-25 23:10 ` [PATCH 27/30] xfs: clean up the attr flag confusion Christoph Hellwig
2020-02-26 1:03 ` Dave Chinner
2020-02-26 15:14 ` Christoph Hellwig
2020-02-26 15:18 ` Christoph Hellwig
2020-02-25 23:10 ` [PATCH 28/30] xfs: remove XFS_DA_OP_INCOMPLETE Christoph Hellwig
2020-02-26 1:03 ` Dave Chinner
2020-02-25 23:10 ` [PATCH 29/30] xfs: embedded the attrlist cursor into struct xfs_attr_list_context Christoph Hellwig
2020-02-25 23:10 ` [PATCH 30/30] xfs: clean up bufsize alignment in xfs_ioc_attr_list Christoph Hellwig
2020-02-26 1:04 ` Dave Chinner
2020-02-26 16:27 ` clean up the attr interface v6 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=20200225231012.735245-13-hch@lst.de \
--to=hch@lst.de \
--cc=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.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).