]> git.baikalelectronics.ru Git - kernel.git/commitdiff
xfs: fix variable state usage
authorDarrick J. Wong <djwong@kernel.org>
Mon, 6 Jun 2022 01:51:22 +0000 (18:51 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Thu, 16 Jun 2022 06:13:32 +0000 (23:13 -0700)
The variable @args is fed to a tracepoint, and that's the only place
it's used.  This is fine for the kernel, but for userspace, tracepoints
are #define'd out of existence, which results in this warning on gcc
11.2:

xfs_attr.c: In function ‘xfs_attr_node_try_addname’:
xfs_attr.c:1440:42: warning: unused variable ‘args’ [-Wunused-variable]
 1440 |         struct xfs_da_args              *args = attr->xattri_da_args;
      |                                          ^~~~

Clean this up.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
fs/xfs/libxfs/xfs_attr.c

index 0847b4e162378de915a568a1cb661f0d58dcc552..1824f61621a24496ccffc83a642b2c43a19a81ad 100644 (file)
@@ -1441,12 +1441,11 @@ static int
 xfs_attr_node_try_addname(
        struct xfs_attr_intent          *attr)
 {
-       struct xfs_da_args              *args = attr->xattri_da_args;
        struct xfs_da_state             *state = attr->xattri_da_state;
        struct xfs_da_state_blk         *blk;
        int                             error;
 
-       trace_xfs_attr_node_addname(args);
+       trace_xfs_attr_node_addname(state->args);
 
        blk = &state->path.blk[state->path.active-1];
        ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);