libxfs: silence unused var warnings

This takes 2 different approaches, just following similar code
that already exists.  It'll probably make Coverity flag
the pointless assignments, unfortunately.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 1b4ac64c411e9d76f141a421c9c914f5d4b9893a..72fc4b3af0fce42df33c4cfb192b66abddada7d9 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -150,9 +150,9 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };
 #define XFS_TRANS_UNRESERVE_QUOTA_NBLKS(mp,tp,ip,nblks,ninos,fl)       0
 #define XFS_TEST_ERROR(expr,a,b,c)     ( expr )
 #define XFS_WANT_CORRUPTED_GOTO(mp, expr, l)   \
-               { if (!(expr)) { error = EFSCORRUPTED; goto l; } }
+               { (mp) = (mp); if (!(expr)) { error = EFSCORRUPTED; goto l; } }
 #define XFS_WANT_CORRUPTED_RETURN(mp, expr)    \
-               { if (!(expr)) { return EFSCORRUPTED; } }
+               { (mp) = (mp); if (!(expr)) { return EFSCORRUPTED; } }
 
 #ifdef __GNUC__
 #define __return_address       __builtin_return_address(0)
@@ -344,7 +344,11 @@ roundup_64(__uint64_t x, __uint32_t y)
 
 /* space allocation */
 #define xfs_extent_busy_reuse(mp,ag,bno,len,user)      ((void) 0)
-#define xfs_extent_busy_insert(tp,ag,bno,len,flags)    ((void) 0)
+/* avoid unused variable warning */
+#define xfs_extent_busy_insert(tp,ag,bno,len,flags)({  \
+       xfs_agnumber_t __foo = ag;                      \
+       __foo = __foo; /* no set-but-unused warning */  \
+})
 #define xfs_extent_busy_trim(args,fbno,flen,bno,len) \
 do { \
        *(bno) = (fbno); \