Commit 1c51ac09 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: move setting bt_logical_sectorsize out of xfs_setsize_buftarg 



bt_logical_sectorsize and the associated mask is set based on the
constant logical block size in the block_device structure and thus
doesn't need to be updated in xfs_setsize_buftarg.  Move it into
xfs_alloc_buftarg so that it is only done once per buftarg.

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 60335cc0

fs/xfs/xfs_buf.c

+4 −4
Original line number Diff line number Diff line
@@ -1994,10 +1994,6 @@ xfs_setsize_buftarg( 
		return -EINVAL;

	}



	/* Set up device logical sector size mask */

	btp->bt_logical_sectorsize = bdev_logical_block_size(btp->bt_bdev);

	btp->bt_logical_sectormask = bdev_logical_block_size(btp->bt_bdev) - 1;



	return 0;

}
@@ -2028,6 +2024,10 @@ xfs_alloc_buftarg( 
	if (xfs_setsize_buftarg(btp, bdev_logical_block_size(btp->bt_bdev)))

		goto error_free;



	/* Set up device logical sector size mask */

	btp->bt_logical_sectorsize = bdev_logical_block_size(btp->bt_bdev);

	btp->bt_logical_sectormask = bdev_logical_block_size(btp->bt_bdev) - 1;



	/*

	 * 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.