Commit 60335cc0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove xfs_setsize_buftarg_early 



Open code the logic in the only caller, and improve the comment
explaining what is being done here.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 21e308e6

fs/xfs/xfs_buf.c

+7 −15
Original line number Diff line number Diff line
@@ -2001,18 +2001,6 @@ xfs_setsize_buftarg( 
	return 0;

}



/*

 * When allocating the initial buffer target we have not yet

 * read in the superblock, so don't know what sized sectors

 * are being used at this early stage.  Play safe.

 */

STATIC int

xfs_setsize_buftarg_early(

	struct xfs_buftarg	*btp)

{

	return xfs_setsize_buftarg(btp, bdev_logical_block_size(btp->bt_bdev));

}



struct xfs_buftarg *

xfs_alloc_buftarg(

	struct xfs_mount	*mp,
@@ -2033,6 +2021,13 @@ xfs_alloc_buftarg( 
	btp->bt_daxdev = fs_dax_get_by_bdev(btp->bt_bdev, &btp->bt_dax_part_off,

					    mp, ops);



	/*

	 * When allocating the buftargs we have not yet read the super block and

	 * thus don't know the file system sector size yet.

	 */

	if (xfs_setsize_buftarg(btp, bdev_logical_block_size(btp->bt_bdev)))

		goto error_free;



	/*

	 * Buffer IO error rate limiting. Limit it to no more than 10 messages

	 * per 30 seconds so as to not spam logs too much on repeated errors.
@@ -2040,9 +2035,6 @@ xfs_alloc_buftarg( 
	ratelimit_state_init(&btp->bt_ioerror_rl, 30 * HZ,

			     DEFAULT_RATELIMIT_BURST);



	if (xfs_setsize_buftarg_early(btp))

		goto error_free;



	if (list_lru_init(&btp->bt_lru))

		goto error_free;