diff options
| author |   Jeff Mahoney <jeffm@suse.com> | 2011-10-03 23:23:13 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.cz> | 2012-03-22 01:45:33 +0100 |
| commit | 3444a97255de907f32562741fb6d104620b9fce3 (patch) | |
| tree | 6ef2b2cb582a6331e30175ce0d4da7503059f88f /fs/btrfs/inode.c | |
| parent | btrfs: Simplify btrfs_submit_bio_hook (diff) | |
| download | linux-dev-3444a97255de907f32562741fb6d104620b9fce3.tar.xz linux-dev-3444a97255de907f32562741fb6d104620b9fce3.zip | |
btrfs: Factor out tree->ops->merge_bio_hook call
In submit_extent_page, there's a visually noisy if statement that, in
the midst of other conditions, does the tree dependency for tree->ops
and tree->ops->merge_bio_hook before calling it, and then another
condition afterwards. If an error is returned from merge_bio_hook,
there's no way to catch it. It's considered a routine "1" return
value instead of a failure.
This patch factors out the dependency check into a new local merge_bio
routine and BUG's on an error. The if statement is less noisy as a side-
effect.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f0dfd7de0205..ad1e88d25031 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1425,10 +1425,11 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset, map_length = length; ret = btrfs_map_block(map_tree, READ, logical, &map_length, NULL, 0); - + /* Will always return 0 or 1 with map_multi == NULL */ + BUG_ON(ret < 0); if (map_length < length + size) return 1; - return ret; + return 0; } /* |