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

torvalds · torvalds · commit d865983292cf · 2012-06-16T17:01:41.000-07:00
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
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
@@ -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);
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
@@ -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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1308,7 +1308,8 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root,`
`1308`	`1308`	`}`
`1309`	`1309`	`if (device->fs_devices && device->fs_devices->seeding) {`
`1310`	`1310`	`printk(KERN_INFO "btrfs: resizer unable to apply on "`
`1311`		`- "seeding device %llu\n", devid);`
	`1311`	`+ "seeding device %llu\n",`
	`1312`	`+ (unsigned long long)devid);`
`1312`	`1313`	`ret = -EINVAL;`
`1313`	`1314`	`goto out_free;`
`1314`	`1315`	`}`