From: Darrick J. Wong Date: Wed, 6 Jul 2022 18:48:57 +0000 (-0500) Subject: xfs: fix variable state usage X-Git-Tag: v5.19.0-rc0.1~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53cbe27875ebe17ea83aff63d875dee0896dd4ca;p=thirdparty%2Fxfsprogs-dev.git xfs: fix variable state usage Source kernel commit: 10930b254d5be1cb4350fb7a456ccd5ea7e3cbd9 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 Reviewed-by: Dave Chinner Reviewed-by: Allison Henderson Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c index d2e28a27a..dba528e67 100644 --- a/libxfs/xfs_attr.c +++ b/libxfs/xfs_attr.c @@ -1439,12 +1439,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);