From ee9c6f15eb02d365aadcba51285867f61ddbac31 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 3 Oct 2011 23:23:12 -0400 Subject: [PATCH] --- yaml --- r: 297867 b: refs/heads/master c: 0417341e6bd93e2a2ceac0e57409706803b335e5 h: refs/heads/master i: 297865: e8b5c05e7d0a3e10f13e54f22a50c932bbe22f98 297863: 11197663317c41d43701195f0efac77d7eb08bd6 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/inode.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8364023fd94a..5bdeae1a5ea3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b45a9d8b48e5ce534bd222007c43cbf374544f0b +refs/heads/master: 0417341e6bd93e2a2ceac0e57409706803b335e5 diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 892b34785ccc..f0dfd7de0205 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/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; 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)) {