diff options
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r-- | fs/btrfs/ioctl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index c2aa33e3feb5..bca729fc80c8 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/compat.h> | 38 | #include <linux/compat.h> |
39 | #include <linux/bit_spinlock.h> | 39 | #include <linux/bit_spinlock.h> |
40 | #include <linux/security.h> | 40 | #include <linux/security.h> |
41 | #include <linux/version.h> | ||
42 | #include <linux/xattr.h> | 41 | #include <linux/xattr.h> |
43 | #include <linux/vmalloc.h> | 42 | #include <linux/vmalloc.h> |
44 | #include "compat.h" | 43 | #include "compat.h" |
@@ -71,7 +70,7 @@ static noinline int create_subvol(struct btrfs_root *root, | |||
71 | u64 index = 0; | 70 | u64 index = 0; |
72 | unsigned long nr = 1; | 71 | unsigned long nr = 1; |
73 | 72 | ||
74 | ret = btrfs_check_free_space(root, 1, 0); | 73 | ret = btrfs_check_metadata_free_space(root); |
75 | if (ret) | 74 | if (ret) |
76 | goto fail_commit; | 75 | goto fail_commit; |
77 | 76 | ||
@@ -204,7 +203,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry, | |||
204 | if (!root->ref_cows) | 203 | if (!root->ref_cows) |
205 | return -EINVAL; | 204 | return -EINVAL; |
206 | 205 | ||
207 | ret = btrfs_check_free_space(root, 1, 0); | 206 | ret = btrfs_check_metadata_free_space(root); |
208 | if (ret) | 207 | if (ret) |
209 | goto fail_unlock; | 208 | goto fail_unlock; |
210 | 209 | ||
@@ -375,7 +374,7 @@ static int btrfs_defrag_file(struct file *file) | |||
375 | unsigned long i; | 374 | unsigned long i; |
376 | int ret; | 375 | int ret; |
377 | 376 | ||
378 | ret = btrfs_check_free_space(root, inode->i_size, 0); | 377 | ret = btrfs_check_data_free_space(root, inode, inode->i_size); |
379 | if (ret) | 378 | if (ret) |
380 | return -ENOSPC; | 379 | return -ENOSPC; |
381 | 380 | ||