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

Commit d8659832 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs compile warning fixes from Chris Mason.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: cast devid to unsigned long long for printk %llu
  Btrfs: init old_generation in get_old_root
parents c458175e a8c4a33b

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
	struct tree_mod_elem *tm;

	struct extent_buffer *eb;

	struct tree_mod_root *old_root = NULL;

	u64 old_generation;

	u64 old_generation = 0;

	u64 logical;



	eb = btrfs_read_lock_root_node(root);

fs/btrfs/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,8 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root, 
	}

	if (device->fs_devices && device->fs_devices->seeding) {

		printk(KERN_INFO "btrfs: resizer unable to apply on "

		       "seeding device %llu\n", devid);

		       "seeding device %llu\n",

		       (unsigned long long)devid);

		ret = -EINVAL;

		goto out_free;

	}