mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-29 07:34:06 +08:00
xfs: remove xfs_getsb
Merge xfs_getsb into its only caller, and clean that one up a little bit as well. 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>
This commit is contained in:
parent
cead0b10f5
commit
b3f8e08ca8
@ -3268,14 +3268,14 @@ xlog_do_log_recovery(
|
|||||||
*/
|
*/
|
||||||
STATIC int
|
STATIC int
|
||||||
xlog_do_recover(
|
xlog_do_recover(
|
||||||
struct xlog *log,
|
struct xlog *log,
|
||||||
xfs_daddr_t head_blk,
|
xfs_daddr_t head_blk,
|
||||||
xfs_daddr_t tail_blk)
|
xfs_daddr_t tail_blk)
|
||||||
{
|
{
|
||||||
struct xfs_mount *mp = log->l_mp;
|
struct xfs_mount *mp = log->l_mp;
|
||||||
int error;
|
struct xfs_buf *bp = mp->m_sb_bp;
|
||||||
xfs_buf_t *bp;
|
struct xfs_sb *sbp = &mp->m_sb;
|
||||||
xfs_sb_t *sbp;
|
int error;
|
||||||
|
|
||||||
trace_xfs_log_recover(log, head_blk, tail_blk);
|
trace_xfs_log_recover(log, head_blk, tail_blk);
|
||||||
|
|
||||||
@ -3289,9 +3289,8 @@ xlog_do_recover(
|
|||||||
/*
|
/*
|
||||||
* If IO errors happened during recovery, bail out.
|
* If IO errors happened during recovery, bail out.
|
||||||
*/
|
*/
|
||||||
if (XFS_FORCED_SHUTDOWN(mp)) {
|
if (XFS_FORCED_SHUTDOWN(mp))
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We now update the tail_lsn since much of the recovery has completed
|
* We now update the tail_lsn since much of the recovery has completed
|
||||||
@ -3305,10 +3304,12 @@ xlog_do_recover(
|
|||||||
xlog_assign_tail_lsn(mp);
|
xlog_assign_tail_lsn(mp);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now that we've finished replaying all buffer and inode
|
* Now that we've finished replaying all buffer and inode updates,
|
||||||
* updates, re-read in the superblock and reverify it.
|
* re-read the superblock and reverify it.
|
||||||
*/
|
*/
|
||||||
bp = xfs_getsb(mp);
|
xfs_buf_lock(bp);
|
||||||
|
xfs_buf_hold(bp);
|
||||||
|
ASSERT(bp->b_flags & XBF_DONE);
|
||||||
bp->b_flags &= ~(XBF_DONE | XBF_ASYNC);
|
bp->b_flags &= ~(XBF_DONE | XBF_ASYNC);
|
||||||
ASSERT(!(bp->b_flags & XBF_WRITE));
|
ASSERT(!(bp->b_flags & XBF_WRITE));
|
||||||
bp->b_flags |= XBF_READ;
|
bp->b_flags |= XBF_READ;
|
||||||
@ -3325,7 +3326,6 @@ xlog_do_recover(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Convert superblock from on-disk format */
|
/* Convert superblock from on-disk format */
|
||||||
sbp = &mp->m_sb;
|
|
||||||
xfs_sb_from_disk(sbp, bp->b_addr);
|
xfs_sb_from_disk(sbp, bp->b_addr);
|
||||||
xfs_buf_relse(bp);
|
xfs_buf_relse(bp);
|
||||||
|
|
||||||
|
@ -1289,23 +1289,6 @@ xfs_mod_frextents(
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* xfs_getsb() is called to obtain the buffer for the superblock.
|
|
||||||
* The buffer is returned locked and read in from disk.
|
|
||||||
* The buffer should be released with a call to xfs_brelse().
|
|
||||||
*/
|
|
||||||
struct xfs_buf *
|
|
||||||
xfs_getsb(
|
|
||||||
struct xfs_mount *mp)
|
|
||||||
{
|
|
||||||
struct xfs_buf *bp = mp->m_sb_bp;
|
|
||||||
|
|
||||||
xfs_buf_lock(bp);
|
|
||||||
xfs_buf_hold(bp);
|
|
||||||
ASSERT(bp->b_flags & XBF_DONE);
|
|
||||||
return bp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Used to free the superblock along various error paths.
|
* Used to free the superblock along various error paths.
|
||||||
*/
|
*/
|
||||||
|
@ -410,7 +410,6 @@ extern int xfs_mod_fdblocks(struct xfs_mount *mp, int64_t delta,
|
|||||||
bool reserved);
|
bool reserved);
|
||||||
extern int xfs_mod_frextents(struct xfs_mount *mp, int64_t delta);
|
extern int xfs_mod_frextents(struct xfs_mount *mp, int64_t delta);
|
||||||
|
|
||||||
extern struct xfs_buf *xfs_getsb(xfs_mount_t *);
|
|
||||||
extern int xfs_readsb(xfs_mount_t *, int);
|
extern int xfs_readsb(xfs_mount_t *, int);
|
||||||
extern void xfs_freesb(xfs_mount_t *);
|
extern void xfs_freesb(xfs_mount_t *);
|
||||||
extern bool xfs_fs_writable(struct xfs_mount *mp, int level);
|
extern bool xfs_fs_writable(struct xfs_mount *mp, int level);
|
||||||
|
Loading…
Reference in New Issue
Block a user