[DRBD-cvs] drbd by phil; Removed the APP_BH_SECTOR macro. Had a l...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Sun, 25 Jan 2004 11:18:25 +0100 (CET)
DRBD CVS committal
Author : phil
Module : drbd
Dir : drbd/drbd
Modified Files:
Tag: rel-0_7-branch
drbd_compat_wrappers.h drbd_main.c drbd_receiver.c
drbd_req-2.4.c
Log Message:
Removed the APP_BH_SECTOR macro. Had a look at the changes from 03-bio.diff.
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -3 -r1.1.2.5 -r1.1.2.6
--- drbd_compat_wrappers.h 25 Jan 2004 00:38:09 -0000 1.1.2.5
+++ drbd_compat_wrappers.h 25 Jan 2004 10:18:19 -0000 1.1.2.6
@@ -14,18 +14,6 @@
extern void drbd_dio_end_sec (struct buffer_head *bh, int uptodate);
extern void drbd_dio_end (struct buffer_head *bh, int uptodate);
-#ifdef DBG_BH_SECTOR
-static inline sector_t APP_BH_SECTOR(struct buffer_head *bh)
-{
- if(IS_VALID_MDEV(bh->b_private)) {
- printk(KERN_ERR DEVICE_NAME" IS_VALID_MDEV(bh->b_private)\n");
- }
- return bh->b_rsector;
-}
-#else
-# define APP_BH_SECTOR(BH) ( (BH)->b_rsector )
-#endif
-
/*
* becase in 2.6.x [sg]et_capacity operate on gendisk->capacity, which is in
* units of 512 bytes sectors, these wrappers have a <<1 or >>1 where
@@ -112,6 +100,11 @@
return ee->private_bio.b_size;
}
+static inline sector_t drbd_pr_get_sector(struct Pending_read *pr)
+{
+ return pr->d.master_bio->b_rsector;
+}
+
static inline short drbd_bio_get_size(struct buffer_head *bh)
{
return bh->b_size;
@@ -394,6 +387,11 @@
}
static inline unsigned short drbd_ee_get_size(struct Tl_epoch_entry *ee)
+{
+ return 0;
+}
+
+static inline sector_t drbd_pr_get_sector(struct Pending_read *pr)
{
return 0;
}
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_main.c,v
retrieving revision 1.73.2.106
retrieving revision 1.73.2.107
diff -u -3 -r1.73.2.106 -r1.73.2.107
--- drbd_main.c 25 Jan 2004 00:38:09 -0000 1.73.2.106
+++ drbd_main.c 25 Jan 2004 10:18:19 -0000 1.73.2.107
@@ -1880,8 +1880,7 @@
sector_t sector;
int i;
-#warning "FIXME maybe lo_file is ok, too?"
- NOT_IN_26 ( if( mdev->lo_device == 0) return; )
+ if( mdev->lo_file == 0) return;
down(&mdev->md_io_mutex);
buffer = (struct meta_data_on_disk *)drbd_bio_kmap(&mdev->md_io_bio);
@@ -1917,8 +1916,7 @@
sector_t sector;
int i;
-#warning "FIXME maybe lo_file is ok, too?"
- NOT_IN_26 ( if( mdev->lo_device == 0) return; )
+ if( mdev->lo_file == 0) return;
down(&mdev->md_io_mutex);
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_receiver.c,v
retrieving revision 1.97.2.93
retrieving revision 1.97.2.94
diff -u -3 -r1.97.2.93 -r1.97.2.94
--- drbd_receiver.c 24 Jan 2004 18:28:26 -0000 1.97.2.93
+++ drbd_receiver.c 25 Jan 2004 10:18:19 -0000 1.97.2.94
@@ -833,7 +833,7 @@
bio = pr->d.master_bio;
- D_ASSERT( sector == APP_BH_SECTOR(bio) );
+ D_ASSERT( sector == drbd_pr_get_sector(pr) );
rr=drbd_recv(mdev,mdev->data.socket,drbd_bio_kmap(bio),data_size);
drbd_bio_kunmap(bio);
@@ -896,7 +896,7 @@
bio = pr->d.master_bio;
- D_ASSERT( sector == APP_BH_SECTOR(bio) );
+ D_ASSERT( sector == drbd_pr_get_sector(pr) );
e = read_in_block(mdev,data_size);
@@ -1345,7 +1345,7 @@
case AppAndResync:
dec_ap_pending(mdev,HERE);
dec_rs_pending(mdev,HERE);
- drbd_rs_complete_io(mdev,APP_BH_SECTOR(bio));
+ drbd_rs_complete_io(mdev,drbd_pr_get_sector(pr));
break;
case Resync:
ERR("pr with cause 'Resync' on app_reads list.");
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_req-2.4.c,v
retrieving revision 1.33.2.43
retrieving revision 1.33.2.44
diff -u -3 -r1.33.2.43 -r1.33.2.44
--- drbd_req-2.4.c 25 Jan 2004 00:38:09 -0000 1.33.2.43
+++ drbd_req-2.4.c 25 Jan 2004 10:18:19 -0000 1.33.2.44
@@ -176,8 +176,6 @@
nr_sectors = bio_sectors(bio); */
#endif
-#warning "please review"
- // was: if( mdev->lo_device == 0 ) {
if( mdev->lo_file == 0 ) {
if( mdev->cstate < Connected ) {
drbd_bio_IO_error(bio);
@@ -221,14 +219,9 @@
return 0; // Ok everything arranged
}
-#warning "FIXME pls review"
if ( mdev->cstate == SyncTarget &&
bm_get_bit(mdev->mbds_id,sector,size) ) {
struct Pending_read *pr;
- /* FIXME we need to check not only the sector, but the _size_, too.
- * As I pointed out already, I think s this has to be changed
- * completely! -lge
- */
if( rw == WRITE ) {
// Actually nothing special to do.
// Just do a mirrored write.