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

2 files changed, 3 insertions, 2 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 04b06bcf2ca..15cbc2bf4ff 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 58adbd0356d..0e92e576300 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;
         }