From: Darrick J. Wong Date: Wed, 23 Nov 2022 17:09:00 +0000 (-0800) Subject: libxfs: consume the xfs_warn mountpoint argument X-Git-Tag: origin/for-next_2022-12-13~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60066f61ce0340cd62338985dc0f24fda23192d9;p=thirdparty%2Fxfsprogs-dev.git libxfs: consume the xfs_warn mountpoint argument Fix these warnings because xfs_warn doesn't do anything in userspace: xfs_alloc.c: In function ‘xfs_alloc_get_rec’: xfs_alloc.c:246:34: warning: unused variable ‘mp’ [-Wunused-variable] 246 | struct xfs_mount *mp = cur->bc_mp; | ^~ Signed-off-by: Darrick J. Wong Reviewed-by: Carlos Maiolino Signed-off-by: Carlos Maiolino --- diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h index 883b22948..ad4b94758 100644 --- a/libxfs/libxfs_priv.h +++ b/libxfs/libxfs_priv.h @@ -125,7 +125,7 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC }; #define xfs_info(mp,fmt,args...) cmn_err(CE_CONT, _(fmt), ## args) #define xfs_notice(mp,fmt,args...) cmn_err(CE_NOTE, _(fmt), ## args) -#define xfs_warn(mp,fmt,args...) cmn_err(CE_WARN, _(fmt), ## args) +#define xfs_warn(mp,fmt,args...) cmn_err((mp) ? CE_WARN : CE_WARN, _(fmt), ## args) #define xfs_err(mp,fmt,args...) cmn_err(CE_ALERT, _(fmt), ## args) #define xfs_alert(mp,fmt,args...) cmn_err(CE_ALERT, _(fmt), ## args)