[RHEL7,COMMIT] fixup ploop: Cleanup in ploop_make_request()

Submitted by Vasily Averin on Aug. 21, 2020, 8:06 a.m.

Details

Message ID 202008210806.07L86KZF013795@vz7build.vvs.sw.ru
State New
Series "Series without cover letter"
Headers show

Commit Message

Vasily Averin Aug. 21, 2020, 8:06 a.m.
The commit is pushed to "branch-rh7-3.10.0-1127.18.2.vz7.163.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.18.2.vz7.163.3
------>
commit 7d2d185ee6b2dad71fba61a1f673b616c6d78104
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Fri Aug 21 11:06:19 2020 +0300

    fixup ploop: Cleanup in ploop_make_request()
    
    BUG_ON(bio->bi_idx) is already checked in start of this function,
    so there is no a reason to check that twise.
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    VvS: to be merged with: "ploop: add ploop to the tree"
---
 drivers/block/ploop/dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index 25b516c..36c063b 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -990,7 +990,7 @@  static void ploop_make_request(struct request_queue *q, struct bio *bio)
 		plo->st.bio_splits++;
 
 		if (!(bio->bi_rw & REQ_DISCARD))
-			BUG_ON(bio->bi_vcnt != 1 || bio->bi_idx != 0);
+			BUG_ON(bio->bi_vcnt != 1)
 
 		bp = bio_split(bio, first_sectors);
 		ploop_make_request(q, &bp->bio1);