From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 2/6] xfs: remove XBF_ASYNC flag wrapper macros
Date: Fri, 5 Feb 2016 11:37:59 +1100 [thread overview]
Message-ID: <1454632683-20543-3-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1454632683-20543-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
They only set/clear/check a flag, no need for obfuscating this
with a macro.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
fs/xfs/xfs_buf.h | 4 ----
fs/xfs/xfs_buf_item.c | 2 +-
fs/xfs/xfs_log.c | 8 +++-----
fs/xfs/xfs_log_recover.c | 3 +--
4 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index 03b5d3a..2a28d1c 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -321,10 +321,6 @@ void xfs_buf_stale(struct xfs_buf *bp);
#define XFS_BUF_UNSTALE(bp) ((bp)->b_flags &= ~XBF_STALE)
#define XFS_BUF_ISSTALE(bp) ((bp)->b_flags & XBF_STALE)
-#define XFS_BUF_ASYNC(bp) ((bp)->b_flags |= XBF_ASYNC)
-#define XFS_BUF_UNASYNC(bp) ((bp)->b_flags &= ~XBF_ASYNC)
-#define XFS_BUF_ISASYNC(bp) ((bp)->b_flags & XBF_ASYNC)
-
#define XFS_BUF_READ(bp) ((bp)->b_flags |= XBF_READ)
#define XFS_BUF_UNREAD(bp) ((bp)->b_flags &= ~XBF_READ)
#define XFS_BUF_ISREAD(bp) ((bp)->b_flags & XBF_READ)
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 2d2029d..344ab44 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -974,7 +974,7 @@ xfs_buf_iodone_callbacks(
* errors tend to affect the whole device and a failing log write
* will make us give up. But we really ought to do better here.
*/
- if (XFS_BUF_ISASYNC(bp)) {
+ if (bp->b_flags & XBF_ASYNC) {
ASSERT(bp->b_iodone != NULL);
trace_xfs_buf_item_iodone_async(bp, _RET_IP_);
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index aa8c9bf..19db3da 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1212,7 +1212,7 @@ xlog_iodone(xfs_buf_t *bp)
}
/* log I/O is always issued ASYNC */
- ASSERT(XFS_BUF_ISASYNC(bp));
+ ASSERT(bp->b_flags & XBF_ASYNC);
xlog_state_done_syncing(iclog, aborted);
/*
@@ -1865,8 +1865,7 @@ xlog_sync(
bp->b_io_length = BTOBB(count);
bp->b_fspriv = iclog;
XFS_BUF_ZEROFLAGS(bp);
- XFS_BUF_ASYNC(bp);
- bp->b_flags |= XBF_SYNCIO;
+ bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO);
if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) {
bp->b_flags |= XBF_FUA;
@@ -1911,8 +1910,7 @@ xlog_sync(
(char *)&iclog->ic_header + count, split);
bp->b_fspriv = iclog;
XFS_BUF_ZEROFLAGS(bp);
- XFS_BUF_ASYNC(bp);
- bp->b_flags |= XBF_SYNCIO;
+ bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO);
if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)
bp->b_flags |= XBF_FUA;
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 97cfeab..b34337d 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -4926,10 +4926,9 @@ xlog_do_recover(
* updates, re-read in the superblock and reverify it.
*/
bp = xfs_getsb(log->l_mp, 0);
- bp->b_flags &= ~XBF_DONE;
+ bp->b_flags &= ~(XBF_DONE | XBF_ASYNC);
ASSERT(!(XFS_BUF_ISWRITE(bp)));
XFS_BUF_READ(bp);
- XFS_BUF_UNASYNC(bp);
bp->b_ops = &xfs_sb_buf_ops;
error = xfs_buf_submit_wait(bp);
--
2.5.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-02-05 0:41 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 0:37 [PATCH 0/6] xfs: clean up buffer flag macros Dave Chinner
2016-02-05 0:37 ` [PATCH 1/6] xfs: remove XBF_DONE flag wrapper macros Dave Chinner
2016-02-08 9:04 ` Christoph Hellwig
2016-02-05 0:37 ` Dave Chinner [this message]
2016-02-08 9:05 ` [PATCH 2/6] xfs: remove XBF_ASYNC " Christoph Hellwig
2016-02-05 0:38 ` [PATCH 3/6] xfs: remove XBF_READ " Dave Chinner
2016-02-08 9:05 ` Christoph Hellwig
2016-02-05 0:38 ` [PATCH 4/6] xfs: remove XBF_WRITE " Dave Chinner
2016-02-08 9:06 ` Christoph Hellwig
2016-02-05 0:38 ` [PATCH 5/6] xfs: remove XBF_STALE " Dave Chinner
2016-02-08 9:07 ` Christoph Hellwig
2016-02-05 0:38 ` [PATCH 6/6] xfs: rename XFS_BUF_ZEROFLAGS macro Dave Chinner
2016-02-08 9:12 ` Christoph Hellwig
2016-02-08 22:31 ` Dave Chinner
2016-02-08 22:59 ` [PATCH 6/6 v2] " Dave Chinner
2016-02-09 9:16 ` [PATCH 6/6] " Christoph Hellwig
2016-02-09 21:23 ` Dave Chinner
2016-02-09 21:38 ` [PATCH 6/6 v3] xfs: remove " Dave Chinner
2016-02-09 21:49 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454632683-20543-3-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox