diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
| commit | 945d8962ceee6bb273365d0bdf42f763225b290f (patch) | |
| tree | 43f5617022c7c947c3c63664e49eb9575ab82f2f /fs/btrfs/dir-item.c | |
| parent | 0d0ca30f180906224be6279788f2b202cfd959d8 (diff) | |
| parent | 4ea028859bbdad34b84c9951fbb832ae10c6a96c (diff) | |
| download | kernel_samsung_smdk4412-945d8962ceee6bb273365d0bdf42f763225b290f.zip kernel_samsung_smdk4412-945d8962ceee6bb273365d0bdf42f763225b290f.tar.gz kernel_samsung_smdk4412-945d8962ceee6bb273365d0bdf42f763225b290f.tar.bz2 | |
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/dir-item.c')
| -rw-r--r-- | fs/btrfs/dir-item.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index e757202..1ddfca7 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -176,7 +176,7 @@ second_insert: ret = 0; goto out_free; } - btrfs_release_path(root, path); + btrfs_release_path(path); ret2 = btrfs_insert_delayed_dir_index(trans, root, name, name_len, dir, &disk_key, type, index); |