Merge branch 'stable/for-linus-3.6' into linux-next

[~andy/linux] / fs / btrfs / ioctl.c

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 58adbd0356d6ef93c301ff2780bb79564d150fa8..0e92e5763005214b5d55d091d6fcfb94d73f4875 100644 (file)
--- 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;
        }