tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds d8659832 c458175e

+3 -2
+1 -1
fs/btrfs/ctree.c
··· 1175 1175 struct tree_mod_elem *tm; 1176 1176 struct extent_buffer *eb; 1177 1177 struct tree_mod_root *old_root = NULL; 1178 - u64 old_generation; 1178 + u64 old_generation = 0; 1179 1179 u64 logical; 1180 1180 1181 1181 eb = btrfs_read_lock_root_node(root);
+2 -1
fs/btrfs/ioctl.c
··· 1308 1308 } 1309 1309 if (device->fs_devices && device->fs_devices->seeding) { 1310 1310 printk(KERN_INFO "btrfs: resizer unable to apply on " 1311 - "seeding device %llu\n", devid); 1311 + "seeding device %llu\n", 1312 + (unsigned long long)devid); 1312 1313 ret = -EINVAL; 1313 1314 goto out_free; 1314 1315 }