btrfs: Factor out tree->ops->merge_bio_hook call

Browse source

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>

...

This commit is contained in:

Jeff Mahoney 2011-10-03 23:23:13 -04:00 • committed by David Sterba

parent 0417341e6b

commit 3444a97255

2 changed files with 17 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

fs/btrfs/extent_io.c

View file

5

fs/btrfs/inode.c

View file