From: Darrick J. Wong <djwong@xxxxxxxxxx>
Move the xfs_buftarg_config_atomic_writes call to xfs_setsize_buftarg
now that we only call it after reading the filesystem geometry from the
primary superblock.
Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
---
hch: is this better? patch 16 can move up, and this can be folded into
patch 5
---
fs/xfs/xfs_buf.h | 1 -
fs/xfs/xfs_buf.c | 66 +++++++++++++++++++++++++---------------------------
fs/xfs/xfs_super.c | 3 --
3 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
index 2f809e33ec66da..8267e41bdaf834 100644
--- a/fs/xfs/xfs_buf.h
+++ b/fs/xfs/xfs_buf.h
@@ -375,7 +375,6 @@ extern void xfs_free_buftarg(struct xfs_buftarg *);
extern void xfs_buftarg_wait(struct xfs_buftarg *);
extern void xfs_buftarg_drain(struct xfs_buftarg *);
extern int xfs_setsize_buftarg(struct xfs_buftarg *, unsigned int);
-void xfs_buftarg_config_atomic_writes(struct xfs_buftarg *btp);
#define xfs_getsize_buftarg(buftarg) block_size((buftarg)->bt_bdev)
#define xfs_readonly_buftarg(buftarg) bdev_read_only((buftarg)->bt_bdev)
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 437fef08b7cf7b..62f74cb03c9783 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1714,6 +1714,35 @@ xfs_free_buftarg(
kfree(btp);
}
+/*
+ * Configure this buffer target for hardware-assisted atomic writes if the
+ * underlying block device supports is congruent with the filesystem geometry.
+ */
+static inline void
+xfs_buftarg_config_atomic_writes(
+ struct xfs_buftarg *btp)
+{
+ struct xfs_mount *mp = btp->bt_mount;
+ unsigned int min_bytes, max_bytes;
+
+ min_bytes = bdev_atomic_write_unit_min_bytes(btp->bt_bdev);
+ max_bytes = bdev_atomic_write_unit_max_bytes(btp->bt_bdev);
+
+ /*
+ * Ignore atomic write geometry that is nonsense or doesn't even cover
+ * a single fsblock.
+ */
+ if (min_bytes > max_bytes ||
+ min_bytes > mp->m_sb.sb_blocksize ||
+ max_bytes < mp->m_sb.sb_blocksize) {
+ min_bytes = 0;
+ max_bytes = 0;
+ }
+
+ btp->bt_bdev_awu_min = min_bytes;
+ btp->bt_bdev_awu_max = max_bytes;
+}
+
int
xfs_setsize_buftarg(
struct xfs_buftarg *btp,
@@ -1733,6 +1762,9 @@ xfs_setsize_buftarg(
return -EINVAL;
}
+ if (bdev_can_atomic_write(btp->bt_bdev))
+ xfs_buftarg_config_atomic_writes(btp);
+
/*
* Flush the block device pagecache so our bios see anything dirtied
* before mount.
@@ -1779,40 +1811,6 @@ xfs_init_buftarg(
return -ENOMEM;
}
-/*
- * Configure this buffer target for hardware-assisted atomic writes if the
- * underlying block device supports is congruent with the filesystem geometry.
- */
-void
-xfs_buftarg_config_atomic_writes(
- struct xfs_buftarg *btp)
-{
- struct xfs_mount *mp = btp->bt_mount;
- unsigned int min_bytes, max_bytes;
-
- ASSERT(btp->bt_bdev != NULL);
-
- if (!bdev_can_atomic_write(btp->bt_bdev))
- return;
-
- min_bytes = bdev_atomic_write_unit_min_bytes(btp->bt_bdev);
- max_bytes = bdev_atomic_write_unit_max_bytes(btp->bt_bdev);
-
- /*
- * Ignore atomic write geometry that is nonsense or doesn't even cover
- * a single fsblock.
- */
- if (min_bytes > max_bytes ||
- min_bytes > mp->m_sb.sb_blocksize ||
- max_bytes < mp->m_sb.sb_blocksize) {
- min_bytes = 0;
- max_bytes = 0;
- }
-
- btp->bt_bdev_awu_min = min_bytes;
- btp->bt_bdev_awu_max = max_bytes;
-}
-
struct xfs_buftarg *
xfs_alloc_buftarg(
struct xfs_mount *mp,
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index b6b6fb4ce8ca65..48b9c62500df4b 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -540,7 +540,6 @@ xfs_setup_devices(
error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_sectsize);
if (error)
return error;
- xfs_buftarg_config_atomic_writes(mp->m_ddev_targp);
if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) {
unsigned int log_sector_size = BBSIZE;
@@ -551,7 +550,6 @@ xfs_setup_devices(
log_sector_size);
if (error)
return error;
- xfs_buftarg_config_atomic_writes(mp->m_logdev_targp);
}
if (mp->m_sb.sb_rtstart) {
@@ -566,7 +564,6 @@ xfs_setup_devices(
mp->m_sb.sb_sectsize);
if (error)
return error;
- xfs_buftarg_config_atomic_writes(mp->m_rtdev_targp);
}
return 0;
