diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:31:37 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:31:37 -0400 |
| commit | 1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225 (patch) | |
| tree | a7dde6312ec24eb6368cad7a3efedbf368a5a70c /fs/btrfs/export.c | |
| parent | b5d67f64f9bc656970dacba245410f0faedad18e (diff) | |
| parent | 65139ed99234d8505948cdb7a835452eb5c191f9 (diff) | |
| download | lwn-1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225.tar.gz lwn-1d4284bd6e8d7dd1d5521a6747bdb6dc1caf0225.zip | |
Merge branch 'error-handling' into for-linus
Conflicts:
fs/btrfs/ctree.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode.c
fs/btrfs/scrub.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/export.c')
| -rw-r--r-- | fs/btrfs/export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c index 5f77166fd01c..e887ee62b6d4 100644 --- a/fs/btrfs/export.c +++ b/fs/btrfs/export.c @@ -193,7 +193,7 @@ static struct dentry *btrfs_get_parent(struct dentry *child) if (ret < 0) goto fail; - BUG_ON(ret == 0); + BUG_ON(ret == 0); /* Key with offset of -1 found */ if (path->slots[0] == 0) { ret = -ENOENT; goto fail; |