[PATCH 02/12] xfs: Remove the macro XFS_BUF_ZEROFLAGS

[Chandra Seetharaman <sekharan@xxxxxxxxxx>]

Remove the definition and usage of the macro XFS_BUF_ZEROFLAGS.

In the specific contexts, not all flags need to be cleared. Hence the
simplification.

Rationale for xfs_log.c:
from hch: XBF_READ and XBF_DELWRI will never be set here, XBF_WRITE
XBF_ASYNC, and XBF_SYNCIO are set just below.
Hence clearing only XBF_FUA and XBF_FLUSH would suffice.

Rationale for xfs_log_recover.c
from hch: XBF_READ, XBF_WRITE, XBF_ASYNC and XBF_DELWRI already get dealt with
in xfs_bwrite a few lines down.
Hence clearing only XBF_SYNCIO, XBF_FUA and XBF_FLUSH would suffice.

Signed-off-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
---
 fs/xfs/linux-2.6/xfs_buf.h |    5 -----
 fs/xfs/xfs_log.c           |    4 ++--
 fs/xfs/xfs_log_recover.c   |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_buf.h b/fs/xfs/linux-2.6/xfs_buf.h
index 6b6c25f..d7df7b6 100644
--- a/fs/xfs/linux-2.6/xfs_buf.h
+++ b/fs/xfs/linux-2.6/xfs_buf.h
@@ -231,11 +231,6 @@ extern void xfs_buf_terminate(void);
 #define xfs_buf_target_name(target)    \
        ({ char __b[BDEVNAME_SIZE]; bdevname((target)->bt_bdev, __b); __b; })
 
-
-#define XFS_BUF_ZEROFLAGS(bp) \
-       ((bp)->b_flags &= ~(XBF_READ|XBF_WRITE|XBF_ASYNC|XBF_DELWRI| \
-                           XBF_SYNCIO|XBF_FUA|XBF_FLUSH))
-
 void xfs_buf_stale(struct xfs_buf *bp);
 #define XFS_BUF_STALE(bp)      xfs_buf_stale(bp);
 #define XFS_BUF_UNSTALE(bp)    ((bp)->b_flags &= ~XBF_STALE)
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 06ff843..5319a95 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1354,7 +1354,7 @@ xlog_sync(xlog_t          *log,
        }
        XFS_BUF_SET_COUNT(bp, count);
        bp->b_fspriv = iclog;
-       XFS_BUF_ZEROFLAGS(bp);
+       bp->b_flags &= ~(XBF_FUA|XBF_FLUSH);
        XFS_BUF_BUSY(bp);
        XFS_BUF_ASYNC(bp);
        bp->b_flags |= XBF_SYNCIO;
@@ -1401,7 +1401,7 @@ xlog_sync(xlog_t          *log,
                XFS_BUF_SET_PTR(bp, 
(xfs_caddr_t)((__psint_t)&(iclog->ic_header)+
                                            (__psint_t)count), split);
                bp->b_fspriv = iclog;
-               XFS_BUF_ZEROFLAGS(bp);
+               bp->b_flags &= ~(XBF_FUA|XBF_FLUSH);
                XFS_BUF_BUSY(bp);
                XFS_BUF_ASYNC(bp);
                bp->b_flags |= XBF_SYNCIO;
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 8fe4206..3913b2f 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -265,7 +265,7 @@ xlog_bwrite(
        ASSERT(BBTOB(nbblks) <= XFS_BUF_SIZE(bp));
 
        XFS_BUF_SET_ADDR(bp, log->l_logBBstart + blk_no);
-       XFS_BUF_ZEROFLAGS(bp);
+       bp->b_flags &= ~(XBF_SYNCIO|XBF_FUA|XBF_FLUSH);
        XFS_BUF_BUSY(bp);
        XFS_BUF_HOLD(bp);
        xfs_buf_lock(bp);
-- 
1.7.1