Skip to content

Commit

Permalink
btrfs: Simplify btrfs_submit_bio_hook
Browse files Browse the repository at this point in the history
btrfs_submit_bio_hook currently calls btrfs_bio_wq_end_io in either case
of an if statement that determines one of the arguments.

This patch moves the function call outside of the if statement and uses it
to only determine the different argument. This allows us to catch an
error in one place in a more visually obvious way.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
  • Loading branch information
Jeff Mahoney authored and David Sterba committed Mar 22, 2012
1 parent b45a9d8 commit 0417341
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1479,13 +1479,14 @@ static int btrfs_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
struct btrfs_root *root = BTRFS_I(inode)->root;
int ret = 0;
int skip_sum;
int metadata = 0;

skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;

if (btrfs_is_free_space_inode(root, inode))
ret = btrfs_bio_wq_end_io(root->fs_info, bio, 2);
else
ret = btrfs_bio_wq_end_io(root->fs_info, bio, 0);
metadata = 2;

ret = btrfs_bio_wq_end_io(root->fs_info, bio, metadata);
BUG_ON(ret);

if (!(rw & REQ_WRITE)) {
Expand Down

0 comments on commit 0417341

Please sign in to comment.