From: Eric Sandeen <sandeen@sandeen.net>
Date: Wed, 2 Jan 2013 23:05:27 +0000 (-0600)
Subject: xfs_logprint: kill XLOG_SET
X-Git-Tag: v3.1.11~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e22d3185435814e4b652987a9421436e1eaeb31;p=thirdparty%2Fxfsprogs-dev.git

xfs_logprint: kill XLOG_SET

Per Christoph's suggestion, kill off XLOG_SET macro
in favor of explicit "&" tests.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
---

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index b7af4ae3a..2e3dbdfdb 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -25,8 +25,6 @@
 #define BAD_HEADER	(-1)
 #define NO_ERROR	(0)
 
-#define XLOG_SET(f,b)	(((f) & (b)) == (b))
-
 static int logBBsize;
 char *trans_type[] = {
 	"",
@@ -646,7 +644,7 @@ xlog_print_trans_inode(xfs_caddr_t *ptr,
     op_head = (xlog_op_header_t *)*ptr;
     xlog_print_op_header(op_head, *i, ptr);
 
-    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))  {
+    if (op_head->oh_flags & XLOG_CONTINUE_TRANS)  {
 	return f->ilf_size-1;
     }
 
@@ -701,7 +699,7 @@ xlog_print_trans_inode(xfs_caddr_t *ptr,
 	    }
 
 	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))
+	    if (op_head->oh_flags & XLOG_CONTINUE_TRANS)
 		return 1;
 	    op_head = (xlog_op_header_t *)*ptr;
     }
@@ -727,7 +725,7 @@ xlog_print_trans_inode(xfs_caddr_t *ptr,
 		break;
 	    }
 	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))
+	    if (op_head->oh_flags & XLOG_CONTINUE_TRANS)
 		return 1;
 	    op_head = (xlog_op_header_t *)*ptr;
     }
@@ -935,8 +933,8 @@ xlog_print_record(int			  fd,
 
 	print_xlog_op_line();
 	xlog_print_op_header(op_head, i, &ptr);
-	continued = (XLOG_SET(op_head->oh_flags, XLOG_WAS_CONT_TRANS) ||
-		     XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS));
+	continued = ((op_head->oh_flags & XLOG_WAS_CONT_TRANS) ||
+		     (op_head->oh_flags & XLOG_CONTINUE_TRANS));
 
 	/* print transaction data */
 	if (print_no_data ||