Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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
  • Loading branch information...
commit d865983292cf1e526de8aba31870794909860d5b 2 parents c458175 + a8c4a33
@torvalds authored
Showing with 3 additions and 2 deletions.
  1. +1 −1  fs/btrfs/ctree.c
  2. +2 −1  fs/btrfs/ioctl.c
View
2  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);
View
3  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;
}
Please sign in to comment.
Something went wrong with that request. Please try again.