[DRBD-cvs] drbd by phil; Fixed some bugs in drbd_ee_bio_prepare()...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Fri, 5 Mar 2004 14:50:08 +0100 (CET)


DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_compat_wrappers.h 


Log Message:
Fixed some bugs in drbd_ee_bio_prepare().
 The UML block device does not care for these things, but now
 everything is set up correctly to survive blk_recount_segments -> 
 should work with the SCSI layer.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -3 -r1.1.2.29 -r1.1.2.30
--- drbd_compat_wrappers.h	5 Mar 2004 11:05:30 -0000	1.1.2.29
+++ drbd_compat_wrappers.h	5 Mar 2004 13:50:03 -0000	1.1.2.30
@@ -430,7 +430,6 @@
 	vec->bv_page   = page;
 	vec->bv_len    =
 	bio->bi_size   = PAGE_SIZE;
-	bio->bi_flags  = 1 << BIO_UPTODATE;
 	bio->bi_max_vecs = 1;
 	bio->bi_destructor = NULL;
 	atomic_set(&bio->bi_cnt, 1);
@@ -461,6 +460,8 @@
 	bio->bi_sector  = sector;
 	bio->bi_private = mdev;
 	bio->bi_next    = 0;
+	bio->bi_idx     = 0; // for blk_recount_segments
+	bio->bi_vcnt    = 1; // for blk_recount_segments
 	e->ee_sector = sector;
 	e->ee_size = size;
 }