diff options
author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 11:07:01 (GMT) |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 11:07:01 (GMT) |
commit | dcc6d073225b6b732a52477c91bd4edc9b4d5502 (patch) | |
tree | 71da6844bb03c940c87c01a2a1f8c2e11cf85238 /fs/btrfs/ioctl.c | |
parent | 0965537308ac3b267ea16e731bd73870a51c53b8 (diff) | |
parent | 16cdcec736cd214350cdb591bf1091f8beedefa0 (diff) | |
download | linux-fsl-qoriq-dcc6d073225b6b732a52477c91bd4edc9b4d5502.tar.xz |
Merge branch 'delayed_inode' into inode_numbers
Conflicts:
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/transaction.c
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 bc5c2b0..7ab39db 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -422,7 +422,7 @@ static noinline int create_subvol(struct btrfs_root *root, BUG_ON(ret); ret = btrfs_insert_dir_item(trans, root, - name, namelen, btrfs_ino(dir), &key, + name, namelen, dir, &key, BTRFS_FT_DIR, index); if (ret) goto fail; |