diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-06-01 00:50:28 +0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-06-01 00:49:53 +0400 |
| commit | 1e20932a23578bb1ec59107843574e259b96193f (patch) | |
| tree | 844ae54293c4414fc4c232a36d0e4d4939dc35aa /fs/btrfs/ioctl.c | |
| parent | cfc442b69696b593cb442f09997dcb4cb5748171 (diff) | |
| parent | c31931088fd6cf953bd0868a2647b6c3928e6c96 (diff) | |
| download | linux-1e20932a23578bb1ec59107843574e259b96193f.tar.xz | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/ulist.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 0f8c354c4c76..24b776c08d99 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -368,7 +368,7 @@ static noinline int create_subvol(struct btrfs_root *root, return PTR_ERR(trans); leaf = btrfs_alloc_free_block(trans, root, root->leafsize, - 0, objectid, NULL, 0, 0, 0, 0); + 0, objectid, NULL, 0, 0, 0); if (IS_ERR(leaf)) { ret = PTR_ERR(leaf); goto fail; |