The file system only has a single file system sector size. Read that
from the in-core super block to avoid confusion about the two different
"sector sizes" stored in the buftarg. Note that this loosens the
alignment asserts for memory backed buftargs that set the page size here.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
fs/xfs/xfs_buf.c | 21 +++++----------------
fs/xfs/xfs_buf.h | 17 +----------------
fs/xfs/xfs_buf_mem.c | 2 --
fs/xfs/xfs_super.c | 12 +++---------
4 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index c8f0f8fe433a..0acac5302c54 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -387,11 +387,12 @@ xfs_buf_map_verify(
struct xfs_buftarg *btp,
struct xfs_buf_map *map)
{
+ unsigned int sectsize = btp->bt_mount->m_sb.sb_sectsize;
xfs_daddr_t eofs;
/* Check for IOs smaller than the sector size / not sector aligned */
- ASSERT(!(BBTOB(map->bm_len) < btp->bt_meta_sectorsize));
- ASSERT(!(BBTOB(map->bm_bn) & (xfs_off_t)btp->bt_meta_sectormask));
+ ASSERT(!(BBTOB(map->bm_len) < sectsize));
+ ASSERT(!(BBTOB(map->bm_bn) & (xfs_off_t)(sectsize - 1)));
/*
* Corrupted block numbers can get through to here, unfortunately, so we
@@ -1719,15 +1720,10 @@ xfs_configure_buftarg_atomic_writes(
/* Configure a buffer target that abstracts a block device. */
int
xfs_configure_buftarg(
- struct xfs_buftarg *btp,
- unsigned int sectorsize)
+ struct xfs_buftarg *btp)
{
ASSERT(btp->bt_bdev != NULL);
- /* Set up metadata sector size info */
- btp->bt_meta_sectorsize = sectorsize;
- btp->bt_meta_sectormask = sectorsize - 1;
-
/*
* Flush the block device pagecache so our bios see anything dirtied
* before mount.
@@ -1806,14 +1802,7 @@ xfs_alloc_buftarg(
if (error)
goto error_free;
- /*
- * When allocating the buftargs we have not yet read the super block and
- * thus don't know the file system sector size yet.
- */
- btp->bt_meta_sectorsize = bdev_logical_block_size(btp->bt_bdev);
- btp->bt_meta_sectormask = btp->bt_meta_sectorsize - 1;
-
- error = xfs_init_buftarg(btp, btp->bt_meta_sectorsize,
+ error = xfs_init_buftarg(btp, bdev_logical_block_size(btp->bt_bdev),
mp->m_super->s_id);
if (error)
goto error_free;
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index adc97351f12a..ec17baed2cbb 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -79,19 +79,6 @@ struct xfs_buf_cache {
int xfs_buf_cache_init(struct xfs_buf_cache *bch);
void xfs_buf_cache_destroy(struct xfs_buf_cache *bch);
-/*
- * The xfs_buftarg contains 2 notions of "sector size" -
- *
- * 1) The metadata sector size, which is the minimum unit and
- * alignment of IO which will be performed by metadata operations.
- * 2) The device logical sector size
- *
- * The first is specified at mkfs time, and is stored on-disk in the
- * superblock's sb_sectsize.
- *
- * The latter is derived from the underlying device, and controls direct IO
- * alignment constraints.
- */
struct xfs_buftarg {
dev_t bt_dev;
struct block_device *bt_bdev;
@@ -99,8 +86,6 @@ struct xfs_buftarg {
struct file *bt_file;
u64 bt_dax_part_off;
struct xfs_mount *bt_mount;
- unsigned int bt_meta_sectorsize;
- size_t bt_meta_sectormask;
size_t bt_logical_sectorsize;
size_t bt_logical_sectormask;
@@ -373,7 +358,7 @@ struct xfs_buftarg *xfs_alloc_buftarg(struct xfs_mount *mp,
extern void xfs_free_buftarg(struct xfs_buftarg *);
extern void xfs_buftarg_wait(struct xfs_buftarg *);
extern void xfs_buftarg_drain(struct xfs_buftarg *);
-int xfs_configure_buftarg(struct xfs_buftarg *btp, unsigned int sectorsize);
+int xfs_configure_buftarg(struct xfs_buftarg *btp);
#define xfs_readonly_buftarg(buftarg) bdev_read_only((buftarg)->bt_bdev)
diff --git a/fs/xfs/xfs_buf_mem.c b/fs/xfs/xfs_buf_mem.c
index dcbfa274e06d..46f527750d34 100644
--- a/fs/xfs/xfs_buf_mem.c
+++ b/fs/xfs/xfs_buf_mem.c
@@ -90,8 +90,6 @@ xmbuf_alloc(
btp->bt_dev = (dev_t)-1U;
btp->bt_bdev = NULL; /* in-memory buftargs have no bdev */
btp->bt_file = file;
- btp->bt_meta_sectorsize = XMBUF_BLOCKSIZE;
- btp->bt_meta_sectormask = XMBUF_BLOCKSIZE - 1;
error = xfs_init_buftarg(btp, XMBUF_BLOCKSIZE, descr);
if (error)
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index bb0a82635a77..9067a6977627 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -541,17 +541,12 @@ xfs_setup_devices(
{
int error;
- error = xfs_configure_buftarg(mp->m_ddev_targp, mp->m_sb.sb_sectsize);
+ error = xfs_configure_buftarg(mp->m_ddev_targp);
if (error)
return error;
if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) {
- unsigned int log_sector_size = BBSIZE;
-
- if (xfs_has_sector(mp))
- log_sector_size = mp->m_sb.sb_logsectsize;
- error = xfs_configure_buftarg(mp->m_logdev_targp,
- log_sector_size);
+ error = xfs_configure_buftarg(mp->m_logdev_targp);
if (error)
return error;
}
@@ -564,8 +559,7 @@ xfs_setup_devices(
}
mp->m_rtdev_targp = mp->m_ddev_targp;
} else if (mp->m_rtname) {
- error = xfs_configure_buftarg(mp->m_rtdev_targp,
- mp->m_sb.sb_sectsize);
+ error = xfs_configure_buftarg(mp->m_rtdev_targp);
if (error)
return error;
}
--
2.47.2
