UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: remove XBF_ASYNC flag wrapper macros 

They only set/clear/check a flag, no need for obfuscating this
with a macro.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner 2016-02-10 15:01:11 +11:00 committed by Dave Chinner
parent b0388bf108
commit 1157b32c73
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/xfs_buf.h
View File

@ -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_UNSTALE(bp) ((bp)->b_flags &= ~XBF_STALE)
#define XFS_BUF_ISSTALE(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_READ(bp) ((bp)->b_flags |= XBF_READ)
#define XFS_BUF_UNREAD(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) #define XFS_BUF_ISREAD(bp) ((bp)->b_flags & XBF_READ)

2
fs/xfs/xfs_buf_item.c
View File

@ -1090,7 +1090,7 @@ xfs_buf_iodone_callbacks(
* errors tend to affect the whole device and a failing log write * 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. * 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); ASSERT(bp->b_iodone != NULL);
trace_xfs_buf_item_iodone_async(bp, _RET_IP_); trace_xfs_buf_item_iodone_async(bp, _RET_IP_);

8
fs/xfs/xfs_log.c
View File

@ -1212,7 +1212,7 @@ xlog_iodone(xfs_buf_t *bp)
} }
/* log I/O is always issued ASYNC */ /* log I/O is always issued ASYNC */
ASSERT(XFS_BUF_ISASYNC(bp)); ASSERT(bp->b_flags & XBF_ASYNC);
xlog_state_done_syncing(iclog, aborted); xlog_state_done_syncing(iclog, aborted);
/* /*
@ -1865,8 +1865,7 @@ xlog_sync(
bp->b_io_length = BTOBB(count); bp->b_io_length = BTOBB(count);
bp->b_fspriv = iclog; bp->b_fspriv = iclog;
XFS_BUF_ZEROFLAGS(bp); XFS_BUF_ZEROFLAGS(bp);
XFS_BUF_ASYNC(bp); bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO);
bp->b_flags |= XBF_SYNCIO;
if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) { if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) {
bp->b_flags |= XBF_FUA; bp->b_flags |= XBF_FUA;
@ -1911,8 +1910,7 @@ xlog_sync(
(char *)&iclog->ic_header + count, split); (char *)&iclog->ic_header + count, split);
bp->b_fspriv = iclog; bp->b_fspriv = iclog;
XFS_BUF_ZEROFLAGS(bp); XFS_BUF_ZEROFLAGS(bp);
XFS_BUF_ASYNC(bp); bp->b_flags |= (XBF_ASYNC | XBF_SYNCIO);
bp->b_flags |= XBF_SYNCIO;
if (log->l_mp->m_flags & XFS_MOUNT_BARRIER) if (log->l_mp->m_flags & XFS_MOUNT_BARRIER)
bp->b_flags |= XBF_FUA; bp->b_flags |= XBF_FUA;

3
fs/xfs/xfs_log_recover.c
View File

@ -4926,10 +4926,9 @@ xlog_do_recover(
* updates, re-read in the superblock and reverify it. * updates, re-read in the superblock and reverify it.
*/ */
bp = xfs_getsb(log->l_mp, 0); bp = xfs_getsb(log->l_mp, 0);
bp->b_flags &= ~XBF_DONE; bp->b_flags &= ~(XBF_DONE | XBF_ASYNC);
ASSERT(!(XFS_BUF_ISWRITE(bp))); ASSERT(!(XFS_BUF_ISWRITE(bp)));
XFS_BUF_READ(bp); XFS_BUF_READ(bp);
XFS_BUF_UNASYNC(bp);
bp->b_ops = &xfs_sb_buf_ops; bp->b_ops = &xfs_sb_buf_ops;
error = xfs_buf_submit_wait(bp); error = xfs_buf_submit_wait(bp);