xfs: reduce xfs_attr_try_sf_addname parameters

Source kernel commit: 1ef7729df1f0c5f7bb63a121164f54d376d35835

The dp parameter to this function is an alias of args->dp, so remove it
for clarity before we go adding new callers.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index baf617cfeabe00a9b7ac6ba9c75b6150450668da..175f8572b0f930b2c41529b712bc6af754d95456 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -349,16 +349,14 @@ xfs_attr_set_resv(
  */
 STATIC int
 xfs_attr_try_sf_addname(
-       struct xfs_inode        *dp,
        struct xfs_da_args      *args)
 {
-
        int                     error;
 
        /*
         * Build initial attribute list (if required).
         */
-       if (dp->i_af.if_format == XFS_DINODE_FMT_EXTENTS)
+       if (args->dp->i_af.if_format == XFS_DINODE_FMT_EXTENTS)
                xfs_attr_shortform_create(args);
 
        error = xfs_attr_shortform_addname(args);
@@ -370,9 +368,9 @@ xfs_attr_try_sf_addname(
         * NOTE: this is also the error path (EEXIST, etc).
         */
        if (!error)
-               xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);
+               xfs_trans_ichgtime(args->trans, args->dp, XFS_ICHGTIME_CHG);
 
-       if (xfs_has_wsync(dp->i_mount))
+       if (xfs_has_wsync(args->dp->i_mount))
                xfs_trans_set_sync(args->trans);
 
        return error;
@@ -383,10 +381,9 @@ xfs_attr_sf_addname(
        struct xfs_attr_intent          *attr)
 {
        struct xfs_da_args              *args = attr->xattri_da_args;
-       struct xfs_inode                *dp = args->dp;
        int                             error = 0;
 
-       error = xfs_attr_try_sf_addname(dp, args);
+       error = xfs_attr_try_sf_addname(args);
        if (error != -ENOSPC) {
                ASSERT(!error || error == -EEXIST);
                attr->xattri_dela_state = XFS_DAS_DONE;