]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
libxfs: consume the xfs_warn mountpoint argument libxfs-5.20-sync_2022-07-26
authorDarrick J. Wong <djwong@kernel.org>
Fri, 15 Jul 2022 21:44:53 +0000 (14:44 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Tue, 26 Jul 2022 19:54:56 +0000 (12:54 -0700)
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 <djwong@kernel.org>
libxfs/libxfs_priv.h

index ad920cd9b6dd18b4208a47f40ef12983253ee6f1..b2c3f694b05ee04731c5dce01aa128472d878d00 100644 (file)
@@ -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)