diff options
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 9f135e87850..2624b53ea78 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -437,10 +437,6 @@ out_unlock: | |||
437 | return 0; | 437 | return 0; |
438 | } | 438 | } |
439 | 439 | ||
440 | /* | ||
441 | * Called inside transaction, so use GFP_NOFS | ||
442 | */ | ||
443 | |||
444 | static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg) | 440 | static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg) |
445 | { | 441 | { |
446 | u64 new_size; | 442 | u64 new_size; |
@@ -477,11 +473,13 @@ static int btrfs_ioctl_resize(struct btrfs_root *root, void __user *arg) | |||
477 | *devstr = '\0'; | 473 | *devstr = '\0'; |
478 | devstr = vol_args->name; | 474 | devstr = vol_args->name; |
479 | devid = simple_strtoull(devstr, &end, 10); | 475 | devid = simple_strtoull(devstr, &end, 10); |
480 | printk(KERN_INFO "resizing devid %llu\n", devid); | 476 | printk(KERN_INFO "resizing devid %llu\n", |
477 | (unsigned long long)devid); | ||
481 | } | 478 | } |
482 | device = btrfs_find_device(root, devid, NULL, NULL); | 479 | device = btrfs_find_device(root, devid, NULL, NULL); |
483 | if (!device) { | 480 | if (!device) { |
484 | printk(KERN_INFO "resizer unable to find device %llu\n", devid); | 481 | printk(KERN_INFO "resizer unable to find device %llu\n", |
482 | (unsigned long long)devid); | ||
485 | ret = -EINVAL; | 483 | ret = -EINVAL; |
486 | goto out_unlock; | 484 | goto out_unlock; |
487 | } | 485 | } |
@@ -805,7 +803,8 @@ static long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, | |||
805 | BUG_ON(!trans); | 803 | BUG_ON(!trans); |
806 | 804 | ||
807 | /* punch hole in destination first */ | 805 | /* punch hole in destination first */ |
808 | btrfs_drop_extents(trans, root, inode, off, off+len, 0, &hint_byte); | 806 | btrfs_drop_extents(trans, root, inode, off, off + len, |
807 | off + len, 0, &hint_byte); | ||
809 | 808 | ||
810 | /* clone data */ | 809 | /* clone data */ |
811 | key.objectid = src->i_ino; | 810 | key.objectid = src->i_ino; |