diff options
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 559cb161a60a..996951a8d28d 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -1421,14 +1421,13 @@ static noinline int btrfs_ioctl_resize(struct file *file, | |||
1421 | ret = -EINVAL; | 1421 | ret = -EINVAL; |
1422 | goto out_free; | 1422 | goto out_free; |
1423 | } | 1423 | } |
1424 | printk(KERN_INFO "btrfs: resizing devid %llu\n", | 1424 | printk(KERN_INFO "btrfs: resizing devid %llu\n", devid); |
1425 | (unsigned long long)devid); | ||
1426 | } | 1425 | } |
1427 | 1426 | ||
1428 | device = btrfs_find_device(root->fs_info, devid, NULL, NULL); | 1427 | device = btrfs_find_device(root->fs_info, devid, NULL, NULL); |
1429 | if (!device) { | 1428 | if (!device) { |
1430 | printk(KERN_INFO "btrfs: resizer unable to find device %llu\n", | 1429 | printk(KERN_INFO "btrfs: resizer unable to find device %llu\n", |
1431 | (unsigned long long)devid); | 1430 | devid); |
1432 | ret = -ENODEV; | 1431 | ret = -ENODEV; |
1433 | goto out_free; | 1432 | goto out_free; |
1434 | } | 1433 | } |
@@ -1436,7 +1435,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, | |||
1436 | if (!device->writeable) { | 1435 | if (!device->writeable) { |
1437 | printk(KERN_INFO "btrfs: resizer unable to apply on " | 1436 | printk(KERN_INFO "btrfs: resizer unable to apply on " |
1438 | "readonly device %llu\n", | 1437 | "readonly device %llu\n", |
1439 | (unsigned long long)devid); | 1438 | devid); |
1440 | ret = -EPERM; | 1439 | ret = -EPERM; |
1441 | goto out_free; | 1440 | goto out_free; |
1442 | } | 1441 | } |
@@ -1488,8 +1487,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, | |||
1488 | new_size *= root->sectorsize; | 1487 | new_size *= root->sectorsize; |
1489 | 1488 | ||
1490 | printk_in_rcu(KERN_INFO "btrfs: new size for %s is %llu\n", | 1489 | printk_in_rcu(KERN_INFO "btrfs: new size for %s is %llu\n", |
1491 | rcu_str_deref(device->name), | 1490 | rcu_str_deref(device->name), new_size); |
1492 | (unsigned long long)new_size); | ||
1493 | 1491 | ||
1494 | if (new_size > old_size) { | 1492 | if (new_size > old_size) { |
1495 | trans = btrfs_start_transaction(root, 0); | 1493 | trans = btrfs_start_transaction(root, 0); |