diff mbox series

[14/15] xfs: remove xfs_getsb

Message ID 20200901155018.2524-15-hch@lst.de (mailing list archive)
State Accepted
Headers show
Series [01/15] xfs: refactor the buf ioend disposition code | expand

Commit Message

Christoph Hellwig Sept. 1, 2020, 3:50 p.m. UTC
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>
---
 fs/xfs/xfs_log_recover.c | 26 +++++++++++++-------------
 fs/xfs/xfs_mount.c       | 17 -----------------
 fs/xfs/xfs_mount.h       |  1 -
 3 files changed, 13 insertions(+), 31 deletions(-)

Comments

Darrick J. Wong Sept. 1, 2020, 4:58 p.m. UTC | #1
On Tue, Sep 01, 2020 at 05:50:17PM +0200, Christoph Hellwig wrote:
> 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>

Nice cleanup.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/xfs_log_recover.c | 26 +++++++++++++-------------
>  fs/xfs/xfs_mount.c       | 17 -----------------
>  fs/xfs/xfs_mount.h       |  1 -
>  3 files changed, 13 insertions(+), 31 deletions(-)
> 
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 5449cba657352c..4f5569aab89a08 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -3268,14 +3268,14 @@ xlog_do_log_recovery(
>   */
>  STATIC int
>  xlog_do_recover(
> -	struct xlog	*log,
> -	xfs_daddr_t	head_blk,
> -	xfs_daddr_t	tail_blk)
> +	struct xlog		*log,
> +	xfs_daddr_t		head_blk,
> +	xfs_daddr_t		tail_blk)
>  {
> -	struct xfs_mount *mp = log->l_mp;
> -	int		error;
> -	xfs_buf_t	*bp;
> -	xfs_sb_t	*sbp;
> +	struct xfs_mount	*mp = log->l_mp;
> +	struct xfs_buf		*bp = mp->m_sb_bp;
> +	struct xfs_sb		*sbp = &mp->m_sb;
> +	int			error;
>  
>  	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 (XFS_FORCED_SHUTDOWN(mp)) {
> +	if (XFS_FORCED_SHUTDOWN(mp))
>  		return -EIO;
> -	}
>  
>  	/*
>  	 * 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);
>  
>  	/*
> -	 * Now that we've finished replaying all buffer and inode
> -	 * updates, re-read in the superblock and reverify it.
> +	 * Now that we've finished replaying all buffer and inode updates,
> +	 * 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);
>  	ASSERT(!(bp->b_flags & XBF_WRITE));
>  	bp->b_flags |= XBF_READ;
> @@ -3325,7 +3326,6 @@ xlog_do_recover(
>  	}
>  
>  	/* Convert superblock from on-disk format */
> -	sbp = &mp->m_sb;
>  	xfs_sb_from_disk(sbp, bp->b_addr);
>  	xfs_buf_relse(bp);
>  
> diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
> index c8ae49a1e99c35..09cc7ca91cd398 100644
> --- a/fs/xfs/xfs_mount.c
> +++ b/fs/xfs/xfs_mount.c
> @@ -1288,23 +1288,6 @@ xfs_mod_frextents(
>  	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.
>   */
> diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
> index a72cfcaa4ad12e..dfa429b77ee285 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -410,7 +410,6 @@ extern int	xfs_mod_fdblocks(struct xfs_mount *mp, int64_t delta,
>  				 bool reserved);
>  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 void	xfs_freesb(xfs_mount_t *);
>  extern bool	xfs_fs_writable(struct xfs_mount *mp, int level);
> -- 
> 2.28.0
>
diff mbox series

Patch

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 5449cba657352c..4f5569aab89a08 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3268,14 +3268,14 @@  xlog_do_log_recovery(
  */
 STATIC int
 xlog_do_recover(
-	struct xlog	*log,
-	xfs_daddr_t	head_blk,
-	xfs_daddr_t	tail_blk)
+	struct xlog		*log,
+	xfs_daddr_t		head_blk,
+	xfs_daddr_t		tail_blk)
 {
-	struct xfs_mount *mp = log->l_mp;
-	int		error;
-	xfs_buf_t	*bp;
-	xfs_sb_t	*sbp;
+	struct xfs_mount	*mp = log->l_mp;
+	struct xfs_buf		*bp = mp->m_sb_bp;
+	struct xfs_sb		*sbp = &mp->m_sb;
+	int			error;
 
 	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 (XFS_FORCED_SHUTDOWN(mp)) {
+	if (XFS_FORCED_SHUTDOWN(mp))
 		return -EIO;
-	}
 
 	/*
 	 * 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);
 
 	/*
-	 * Now that we've finished replaying all buffer and inode
-	 * updates, re-read in the superblock and reverify it.
+	 * Now that we've finished replaying all buffer and inode updates,
+	 * 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);
 	ASSERT(!(bp->b_flags & XBF_WRITE));
 	bp->b_flags |= XBF_READ;
@@ -3325,7 +3326,6 @@  xlog_do_recover(
 	}
 
 	/* Convert superblock from on-disk format */
-	sbp = &mp->m_sb;
 	xfs_sb_from_disk(sbp, bp->b_addr);
 	xfs_buf_relse(bp);
 
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index c8ae49a1e99c35..09cc7ca91cd398 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1288,23 +1288,6 @@  xfs_mod_frextents(
 	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.
  */
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index a72cfcaa4ad12e..dfa429b77ee285 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -410,7 +410,6 @@  extern int	xfs_mod_fdblocks(struct xfs_mount *mp, int64_t delta,
 				 bool reserved);
 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 void	xfs_freesb(xfs_mount_t *);
 extern bool	xfs_fs_writable(struct xfs_mount *mp, int level);