From: Miao Xie <miaox@cn.fujitsu.com>
Date: Wed, 19 Jun 2013 10:19:17 +0000 (+0800)
Subject: Btrfs: cleanup redundant code in btrfs_submit_direct()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6da5d2ec9870ddadf4dbc6a1835470636df25bb;p=openwrt%2Fstaging%2Fblogic.git

Btrfs: cleanup redundant code in btrfs_submit_direct()

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 4d7c02258390..0a43d42268f7 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7148,7 +7148,6 @@ static void btrfs_submit_direct(int rw, struct bio *dio_bio,
 {
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	struct btrfs_dio_private *dip;
-	struct bio_vec *bvec = dio_bio->bi_io_vec;
 	struct bio *io_bio;
 	int skip_sum;
 	int write = rw & REQ_WRITE;
@@ -7170,16 +7169,9 @@ static void btrfs_submit_direct(int rw, struct bio *dio_bio,
 	}
 
 	dip->private = dio_bio->bi_private;
-	io_bio->bi_private = dio_bio->bi_private;
 	dip->inode = inode;
 	dip->logical_offset = file_offset;
-
-	dip->bytes = 0;
-	do {
-		dip->bytes += bvec->bv_len;
-		bvec++;
-	} while (bvec <= (dio_bio->bi_io_vec + dio_bio->bi_vcnt - 1));
-
+	dip->bytes = dio_bio->bi_size;
 	dip->disk_bytenr = (u64)dio_bio->bi_sector << 9;
 	io_bio->bi_private = dip;
 	dip->errors = 0;