Commit bf2db0b9 authored Oct 06, 2017 by Linus Torvalds

linux

Pull btrfs fixes from David Sterba:
 "Two more fixes for bugs introduced in 4.13.

  The sector_t problem with 32bit architecture and !LBDAF config seems
  serious but the number of affected deployments is hopefully low.

  The clashing status bits could lead to a confusing in-memory state of
  the whole-filesystem operations if used with the quota override sysfs
  knob"

* 'for-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: fix overlap of fs_info::flags values
  btrfs: avoid overflow when sector_t is 32 bit

parents b77779b9 69ad5976

fs/btrfs/ctree.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -722,7 +722,7 @@ struct btrfs_delayed_root;
		* Indicate that a whole-filesystem exclusive operation is running
		* (device replace, resize, device add/delete, balance)
		*/
		#define BTRFS_FS_EXCL_OP 14
		#define BTRFS_FS_EXCL_OP 16

		struct btrfs_fs_info {
		u8 fsid[BTRFS_FSID_SIZE];

fs/btrfs/extent_io.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2801,7 +2801,7 @@ static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
		}
		}

		bio = btrfs_bio_alloc(bdev, sector << 9);
		bio = btrfs_bio_alloc(bdev, (u64)sector << 9);
		bio_add_page(bio, page, page_size, offset);
		bio->bi_end_io = end_io_func;
		bio->bi_private = tree;