summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-16 17:01:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-16 17:01:41 -0700
commitd865983292cf1e526de8aba31870794909860d5b (patch)
tree8e6d62a3712d6a67f42dd33f193ae4c15f666666
parentc458175eb61843fe9fd37ac3d56b701e98a8cf15 (diff)
parenta8c4a33b98b097e69cd1a10672c43d17ad0ffb25 (diff)
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
-rw-r--r--fs/btrfs/ctree.c2
-rw-r--r--fs/btrfs/ioctl.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 04b06bcf2ca9..15cbc2bf4ff0 100644
--- 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
index 58adbd0356d6..0e92e5763005 100644
--- 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;
}