android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2012-06-16 17:01:41 -07:00
commit d865983292
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.c
View File

@ -1175,7 +1175,7 @@ get_old_root(struct btrfs_root *root, u64 time_seq)
struct tree_mod_elem *tm; struct tree_mod_elem *tm;
struct extent_buffer *eb; struct extent_buffer *eb;
struct tree_mod_root *old_root = NULL; struct tree_mod_root *old_root = NULL;
u64 old_generation; u64 old_generation = 0;
u64 logical; u64 logical;
eb = btrfs_read_lock_root_node(root); eb = btrfs_read_lock_root_node(root);

3
fs/btrfs/ioctl.c
View File

@ -1308,7 +1308,8 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root,
} }
if (device->fs_devices && device->fs_devices->seeding) { if (device->fs_devices && device->fs_devices->seeding) {
printk(KERN_INFO "btrfs: resizer unable to apply on " printk(KERN_INFO "btrfs: resizer unable to apply on "
"seeding device %llu\n", devid); "seeding device %llu\n",
(unsigned long long)devid);
ret = -EINVAL; ret = -EINVAL;
goto out_free; goto out_free;
} }