@@ -1562,7 +1562,9 @@ static inline void btrfs_set_device_total_bytes(struct extent_buffer *eb,
{
BUILD_BUG_ON(sizeof(u64) !=
sizeof(((struct btrfs_dev_item *)0))->total_bytes);
+#ifdef CONFIG_BTRFS_DEBUG
WARN_ON(!IS_ALIGNED(val, eb->fs_info->sectorsize));
+#endif
btrfs_set_64(eb, s, offsetof(struct btrfs_dev_item, total_bytes), val);
}
@@ -6472,15 +6472,23 @@ static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
return 0;
}
-static void fill_device_from_item(struct extent_buffer *leaf,
- struct btrfs_dev_item *dev_item,
- struct btrfs_device *device)
+static void fill_device_from_item(struct btrfs_fs_info *fs_info,
+ struct extent_buffer *leaf,
+ struct btrfs_dev_item *dev_item,
+ struct btrfs_device *device)
{
unsigned long ptr;
device->devid = btrfs_device_id(leaf, dev_item);
device->disk_total_bytes = btrfs_device_total_bytes(leaf, dev_item);
device->total_bytes = device->disk_total_bytes;
+ if (!IS_ALIGNED(device->total_bytes, fs_info->sectorsize)) {
+ btrfs_warn(fs_info,
+ "devid %llu has unaligned total bytes %llu",
+ device->devid, device->disk_total_bytes);
+ btrfs_warn(fs_info,
+ "please shrink the device a little and resize back to fix it");
+ }
device->commit_total_bytes = device->disk_total_bytes;
device->bytes_used = btrfs_device_bytes_used(leaf, dev_item);
device->commit_bytes_used = device->bytes_used;
@@ -6625,7 +6633,7 @@ static int read_one_dev(struct btrfs_fs_info *fs_info,
return -EINVAL;
}
- fill_device_from_item(leaf, dev_item, device);
+ fill_device_from_item(fs_info, leaf, dev_item, device);
device->in_fs_metadata = 1;
if (device->writeable && !device->is_tgtdev_for_dev_replace) {
device->fs_devices->total_rw_bytes += device->total_bytes;
Commit 7dfb8be11b5d ("btrfs: Round down values which are written for total_bytes_size") is fixing the unaligned device size caused by adding/shrinking device. It added a new WARN_ON() when device size is unaligned. This is fine for new device added to btrfs using v4.13 kernel, but not existing device whose total_bytes is already unaligned. And the WARN_ON() will get triggered every time a block group get created/removed on the unaligned device. This patch will only enable the WARN_ON() for CONFIG_BTRFS_DEBUG so developer won't miss any sanity check, but end user will not be troubled by tons of warning. And more useful fix will be output for end users. Reported-by: Rich Rauenzahn <rich@shroop.net> Fixes: 7dfb8be11b5d ("btrfs: Round down values which are written for total_bytes_size") Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> --- changelog: v2: Use CONFIG_BTRFS_DEBUG to encapsulate the WARN_ON(), so end user won't see tons of kernel backtrace and developers can still catch the problem. --- fs/btrfs/ctree.h | 2 ++ fs/btrfs/volumes.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)