Message ID | 20190828042350.6062-3-david@fromorbit.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | xfs: allocate xattr buffer on demand | expand |
On Wed, Aug 28, 2019 at 02:23:49PM +1000, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > Because we repeat exactly the same code to get the remote attribute > value after both calls to xfs_attr3_leaf_getvalue() if it's a remote > attr. Just do it in xfs_attr3_leaf_getvalue() so the callers don't > have to care about it. > > Signed-off-by: Dave Chinner <dchinner@redhat.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/libxfs/xfs_attr.c | 16 +--------------- > fs/xfs/libxfs/xfs_attr_leaf.c | 35 ++++++++++++++++++----------------- > 2 files changed, 19 insertions(+), 32 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 776343c4f22b..5e6b6846e607 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -794,15 +794,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args) > } > error = xfs_attr3_leaf_getvalue(bp, args); > xfs_trans_brelse(args->trans, bp); > - if (error) > - return error; > - > - /* check if we have to retrieve a remote attribute to get the value */ > - if (args->flags & ATTR_KERNOVAL) > - return 0; > - if (!args->rmtblkno) > - return 0; > - return xfs_attr_rmtval_get(args); > + return error; > } > > /*======================================================================== > @@ -1316,12 +1308,6 @@ xfs_attr_node_get(xfs_da_args_t *args) > */ > blk = &state->path.blk[state->path.active - 1]; > retval = xfs_attr3_leaf_getvalue(blk->bp, args); > - if (retval) > - goto out_release; > - if (args->flags & ATTR_KERNOVAL) > - goto out_release; > - if (args->rmtblkno > 0) > - retval = xfs_attr_rmtval_get(args); > > /* > * If not in a transaction, we have to release all the buffers. > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index d056767b5c53..e325cdbc9818 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -2391,25 +2391,26 @@ xfs_attr3_leaf_getvalue( > } > args->valuelen = valuelen; > memcpy(args->value, &name_loc->nameval[args->namelen], valuelen); > - } else { > - name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index); > - ASSERT(name_rmt->namelen == args->namelen); > - ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); > - args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen); > - args->rmtblkno = be32_to_cpu(name_rmt->valueblk); > - args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount, > - args->rmtvaluelen); > - if (args->flags & ATTR_KERNOVAL) { > - args->valuelen = args->rmtvaluelen; > - return 0; > - } > - if (args->valuelen < args->rmtvaluelen) { > - args->valuelen = args->rmtvaluelen; > - return -ERANGE; > - } > + return 0; > + } > + > + name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index); > + ASSERT(name_rmt->namelen == args->namelen); > + ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); > + args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen); > + args->rmtblkno = be32_to_cpu(name_rmt->valueblk); > + args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount, > + args->rmtvaluelen); > + if (args->flags & ATTR_KERNOVAL) { > args->valuelen = args->rmtvaluelen; > + return 0; > } > - return 0; > + if (args->valuelen < args->rmtvaluelen) { > + args->valuelen = args->rmtvaluelen; > + return -ERANGE; > + } > + args->valuelen = args->rmtvaluelen; > + return xfs_attr_rmtval_get(args); > } > > /*======================================================================== > -- > 2.23.0.rc1 >
On Wed, Aug 28, 2019 at 02:23:49PM +1000, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > Because we repeat exactly the same code to get the remote attribute > value after both calls to xfs_attr3_leaf_getvalue() if it's a remote > attr. Just do it in xfs_attr3_leaf_getvalue() so the callers don't > have to care about it. It also refactors xfs_attr3_leaf_getvalue to be more readable first. Which confused the heck out of me when reading the code. I'd prefer that to be split into a prep patch, but on its own both changes look good to me, so: Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 776343c4f22b..5e6b6846e607 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -794,15 +794,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args) } error = xfs_attr3_leaf_getvalue(bp, args); xfs_trans_brelse(args->trans, bp); - if (error) - return error; - - /* check if we have to retrieve a remote attribute to get the value */ - if (args->flags & ATTR_KERNOVAL) - return 0; - if (!args->rmtblkno) - return 0; - return xfs_attr_rmtval_get(args); + return error; } /*======================================================================== @@ -1316,12 +1308,6 @@ xfs_attr_node_get(xfs_da_args_t *args) */ blk = &state->path.blk[state->path.active - 1]; retval = xfs_attr3_leaf_getvalue(blk->bp, args); - if (retval) - goto out_release; - if (args->flags & ATTR_KERNOVAL) - goto out_release; - if (args->rmtblkno > 0) - retval = xfs_attr_rmtval_get(args); /* * If not in a transaction, we have to release all the buffers. diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index d056767b5c53..e325cdbc9818 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -2391,25 +2391,26 @@ xfs_attr3_leaf_getvalue( } args->valuelen = valuelen; memcpy(args->value, &name_loc->nameval[args->namelen], valuelen); - } else { - name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index); - ASSERT(name_rmt->namelen == args->namelen); - ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); - args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen); - args->rmtblkno = be32_to_cpu(name_rmt->valueblk); - args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount, - args->rmtvaluelen); - if (args->flags & ATTR_KERNOVAL) { - args->valuelen = args->rmtvaluelen; - return 0; - } - if (args->valuelen < args->rmtvaluelen) { - args->valuelen = args->rmtvaluelen; - return -ERANGE; - } + return 0; + } + + name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index); + ASSERT(name_rmt->namelen == args->namelen); + ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0); + args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen); + args->rmtblkno = be32_to_cpu(name_rmt->valueblk); + args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount, + args->rmtvaluelen); + if (args->flags & ATTR_KERNOVAL) { args->valuelen = args->rmtvaluelen; + return 0; } - return 0; + if (args->valuelen < args->rmtvaluelen) { + args->valuelen = args->rmtvaluelen; + return -ERANGE; + } + args->valuelen = args->rmtvaluelen; + return xfs_attr_rmtval_get(args); } /*========================================================================