[DRBD-cvs] drbd by lars; some changes for linux 2.4 which got los...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Mon, 26 Jan 2004 21:45:35 +0100 (CET)


DRBD CVS committal

Author  : lars
Module  : drbd

Dir     : drbd/drbd


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


Log Message:
some changes for linux 2.4 which got lost somehow


===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -3 -r1.1.2.9 -r1.1.2.10
--- drbd_compat_wrappers.h	26 Jan 2004 19:32:26 -0000	1.1.2.9
+++ drbd_compat_wrappers.h	26 Jan 2004 20:45:30 -0000	1.1.2.10
@@ -274,9 +274,11 @@
 #endif
 
 static inline void
-drbd_bio_add_page(struct buffer_head *bh, struct page *page, unsigned long offset)
+drbd_bio_add_page(struct buffer_head *bh, struct page *page, unsigned int len,
+		  unsigned int offset)
 {
 	set_bh_page (bh,page,offset);
+	bh->b_size = len;
 	bh->b_this_page = bh;
 }
 
@@ -290,10 +292,12 @@
 	generic_make_request(rw, bh);
 }
 
-static inline void drbd_generic_make_request_wait(int rw, struct buffer_head *bh)
+#warning "FIXME we need to check the return value"
+static inline int drbd_generic_make_request_wait(int rw, struct buffer_head *bh)
 {
 	generic_make_request(rw, bh);
 	wait_on_buffer(bh);
+	return test_bit(BH_Uptodate,&bh->b_state);
 }
 
 static inline void drbd_kick_lo(drbd_dev *mdev)