Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eca152ed authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Manually implement device_total_bytes getter/setter 



The device->total_bytes member needs to always be rounded down to sectorsize
so that it corresponds to the value of super->total_bytes. However, there are
multiple places where the setter is fed a value which is not rounded which
can cause a fs to be unmountable due to the check introduced in
99e3ecfc ("Btrfs: add more validation checks for superblock"). This patch
implements the getter/setter manually so that in a later patch I can add
necessary code to catch offenders.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 0d0c71b3

fs/btrfs/ctree.h

+19 −1
Original line number Diff line number Diff line
@@ -1541,8 +1541,26 @@ static inline void btrfs_set_##name(type *s, u##bits val) \ 
	s->member = cpu_to_le##bits(val);				\

}





static inline u64 btrfs_device_total_bytes(struct extent_buffer *eb,

					   struct btrfs_dev_item *s)

{

	BUILD_BUG_ON(sizeof(u64) !=

		     sizeof(((struct btrfs_dev_item *)0))->total_bytes);

	return btrfs_get_64(eb, s, offsetof(struct btrfs_dev_item,

					    total_bytes));

}

static inline void btrfs_set_device_total_bytes(struct extent_buffer *eb,

						struct btrfs_dev_item *s,

						u64 val)

{

	BUILD_BUG_ON(sizeof(u64) !=

		     sizeof(((struct btrfs_dev_item *)0))->total_bytes);

	btrfs_set_64(eb, s, offsetof(struct btrfs_dev_item, total_bytes), val);

}





BTRFS_SETGET_FUNCS(device_type, struct btrfs_dev_item, type, 64);

BTRFS_SETGET_FUNCS(device_total_bytes, struct btrfs_dev_item, total_bytes, 64);

BTRFS_SETGET_FUNCS(device_bytes_used, struct btrfs_dev_item, bytes_used, 64);

BTRFS_SETGET_FUNCS(device_io_align, struct btrfs_dev_item, io_align, 32);

BTRFS_SETGET_FUNCS(device_io_width, struct btrfs_dev_item, io_width, 32);