diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:31:00 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:31:00 +1100 |
| commit | 7f0ed5461a6f5e4ccd2a3ca1047edbe4bbe217fc (patch) | |
| tree | 47649e956583dd38e869e65d6ee5b20fac0ee1ef /fs/xfs/xfs_log_recover.c | |
| parent | a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f (diff) | |
| parent | 12877da58429affc988403817b88d901fe01f8c1 (diff) | |
| download | op-kernel-dev-7f0ed5461a6f5e4ccd2a3ca1047edbe4bbe217fc.zip op-kernel-dev-7f0ed5461a6f5e4ccd2a3ca1047edbe4bbe217fc.tar.gz | |
Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index e776594..9347bf1 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -190,7 +190,7 @@ xlog_bread_noalign( ASSERT(nbblks <= bp->b_length); XFS_BUF_SET_ADDR(bp, log->l_logBBstart + blk_no); - XFS_BUF_READ(bp); + bp->b_flags |= XBF_READ; bp->b_io_length = nbblks; bp->b_error = 0; @@ -275,7 +275,6 @@ xlog_bwrite( ASSERT(nbblks <= bp->b_length); XFS_BUF_SET_ADDR(bp, log->l_logBBstart + blk_no); - XFS_BUF_ZEROFLAGS(bp); xfs_buf_hold(bp); xfs_buf_lock(bp); bp->b_io_length = nbblks; @@ -4998,10 +4997,9 @@ xlog_do_recover( * updates, re-read in the superblock and reverify it. */ bp = xfs_getsb(log->l_mp, 0); - XFS_BUF_UNDONE(bp); - ASSERT(!(XFS_BUF_ISWRITE(bp))); - XFS_BUF_READ(bp); - XFS_BUF_UNASYNC(bp); + bp->b_flags &= ~(XBF_DONE | XBF_ASYNC); + ASSERT(!(bp->b_flags & XBF_WRITE)); + bp->b_flags |= XBF_READ; bp->b_ops = &xfs_sb_buf_ops; error = xfs_buf_submit_wait(bp); |
