diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 14:37:47 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 14:37:47 -0400 |
| commit | d6c0cb379c5198487e4ac124728cbb2346d63b1f (patch) | |
| tree | 167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a /fs/btrfs/root-tree.c | |
| parent | 8e531cdfeb75269c6c5aae33651cca39707848da (diff) | |
| parent | 1f78160ce1b1b8e657e2248118c4d91f881763f0 (diff) | |
| download | kernel_samsung_tuna-d6c0cb379c5198487e4ac124728cbb2346d63b1f.zip kernel_samsung_tuna-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.gz kernel_samsung_tuna-d6c0cb379c5198487e4ac124728cbb2346d63b1f.tar.bz2 | |
Merge branch 'cleanups_and_fixes' into inode_numbers
Conflicts:
fs/btrfs/tree-log.c
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/root-tree.c')
| -rw-r--r-- | fs/btrfs/root-tree.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 3bcfe5a..ebe4544 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -338,7 +338,10 @@ again: *sequence = btrfs_root_ref_sequence(leaf, ref); ret = btrfs_del_item(trans, tree_root, path); - BUG_ON(ret); + if (ret) { + err = ret; + goto out; + } } else err = -ENOENT; @@ -350,6 +353,7 @@ again: goto again; } +out: btrfs_free_path(path); return err; } |