diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-01 19:55:47 +0200 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2020-09-16 05:52:39 +0200 |
| commit | 26e328759b9bc18329752a75762c059e74a23146 (patch) | |
| tree | 6c5ae2ede1500643e90804b2ba30336a1c1554d2 /fs/xfs/xfs_log_recover.c | |
| parent | xfs: remove xfs_getsb (diff) | |
| download | linux-26e328759b9bc18329752a75762c059e74a23146.tar.xz linux-26e328759b9bc18329752a75762c059e74a23146.zip | |
xfs: reuse _xfs_buf_read for re-reading the superblock
Instead of poking deeply into buffer cache internals when re-reading the
superblock during log recovery just generalize _xfs_buf_read and use it
there. Note that we don't have to explicitly set up the ops as they
must be set from the initial read.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_log_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index a9da4ad87697..a17d788921d6 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -3309,13 +3309,7 @@ xlog_do_recover( */ xfs_buf_lock(bp); xfs_buf_hold(bp); - ASSERT(bp->b_flags & XBF_DONE); - 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(bp); + error = _xfs_buf_read(bp, XBF_READ); if (error) { if (!XFS_FORCED_SHUTDOWN(mp)) { xfs_buf_ioerror_alert(bp, __this_address); |