xfs: remove xfs_getsb (b3f8e08c) · Commits · 戴 / test

fs/xfs/xfs_log_recover.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -3273,9 +3273,9 @@ xlog_do_recover(
		xfs_daddr_t tail_blk)
		{
		struct xfs_mount *mp = log->l_mp;
		struct xfs_buf *bp = mp->m_sb_bp;
		struct xfs_sb *sbp = &mp->m_sb;
		int error;
		xfs_buf_t *bp;
		xfs_sb_t *sbp;

		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);

+0 −17

Original line number	Diff line number	Diff line
		@@ -1289,23 +1289,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.
		*/

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);