瀏覽代碼

btrfs: Simplify btrfs_submit_bio_hook

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>
Jeff Mahoney 13 年之前
父節點
當前提交
0417341e6b
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      fs/btrfs/inode.c

+ 4 - 3
fs/btrfs/inode.c

@@ -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;
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	int ret = 0;
 	int ret = 0;
 	int skip_sum;
 	int skip_sum;
+	int metadata = 0;
 
 
 	skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;
 	skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;
 
 
 	if (btrfs_is_free_space_inode(root, inode))
 	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);
 	BUG_ON(ret);
 
 
 	if (!(rw & REQ_WRITE)) {
 	if (!(rw & REQ_WRITE)) {