diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /fs/btrfs/ioctl.c | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 988fdc8b49eb..bca729fc80c8 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -70,7 +70,7 @@ static noinline int create_subvol(struct btrfs_root *root, | |||
| 70 | u64 index = 0; | 70 | u64 index = 0; |
| 71 | unsigned long nr = 1; | 71 | unsigned long nr = 1; |
| 72 | 72 | ||
| 73 | ret = btrfs_check_free_space(root, 1, 0); | 73 | ret = btrfs_check_metadata_free_space(root); |
| 74 | if (ret) | 74 | if (ret) |
| 75 | goto fail_commit; | 75 | goto fail_commit; |
| 76 | 76 | ||
| @@ -203,7 +203,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry, | |||
| 203 | if (!root->ref_cows) | 203 | if (!root->ref_cows) |
| 204 | return -EINVAL; | 204 | return -EINVAL; |
| 205 | 205 | ||
| 206 | ret = btrfs_check_free_space(root, 1, 0); | 206 | ret = btrfs_check_metadata_free_space(root); |
| 207 | if (ret) | 207 | if (ret) |
| 208 | goto fail_unlock; | 208 | goto fail_unlock; |
| 209 | 209 | ||
| @@ -374,7 +374,7 @@ static int btrfs_defrag_file(struct file *file) | |||
| 374 | unsigned long i; | 374 | unsigned long i; |
| 375 | int ret; | 375 | int ret; |
| 376 | 376 | ||
| 377 | ret = btrfs_check_free_space(root, inode->i_size, 0); | 377 | ret = btrfs_check_data_free_space(root, inode, inode->i_size); |
| 378 | if (ret) | 378 | if (ret) |
| 379 | return -ENOSPC; | 379 | return -ENOSPC; |
| 380 | 380 | ||