summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2014-10-04 09:57:14 -0700
committerChris Mason <clm@fb.com>2014-10-04 09:57:14 -0700
commit27b19cc8864e206c4203041892b0f706f044a0f1 (patch)
treef724dd77efa379da881fba7f46075af17a728bf9 /fs/btrfs/ioctl.c
parentbbf65cf0b5b67843ca094df01019222b85af2183 (diff)
parent4d75f8a9c87b843c8ded15b82b8d137b9724cccc (diff)
downloadop-kernel-dev-27b19cc8864e206c4203041892b0f706f044a0f1.zip
op-kernel-dev-27b19cc8864e206c4203041892b0f706f044a0f1.tar.gz
Merge branch 'cleanup/blocksize-diet-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 87a7267..fd9d190 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -480,8 +480,7 @@ static noinline int create_subvol(struct inode *dir,
if (ret)
goto fail;
- leaf = btrfs_alloc_free_block(trans, root, root->nodesize,
- 0, objectid, NULL, 0, 0, 0);
+ leaf = btrfs_alloc_tree_block(trans, root, 0, objectid, NULL, 0, 0, 0);
if (IS_ERR(leaf)) {
ret = PTR_ERR(leaf);
goto fail;
OpenPOWER on IntegriCloud