[DRBD-cvs] drbd by phil; * Disabled all these #warning's. They ma...
drbd-user@lists.linbit.com
drbd-user@lists.linbit.com
Sun, 1 Feb 2004 13:09:37 +0100 (CET)
DRBD CVS committal
Author : phil
Module : drbd
Dir : drbd/drbd
Modified Files:
Tag: rel-0_7-branch
drbd_compat_types.h drbd_compat_wrappers.h drbd_dsender.c
drbd_fs.c drbd_main.c drbd_req-2.4.c
Log Message:
* Disabled all these #warning's. They make me mad! I could not find the
real compiler messages.
* Inserted a missing bd_claim() / bd_release() pair. Now secondarys are
also claimed after module load.
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_types.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- drbd_compat_types.h 27 Jan 2004 09:16:50 -0000 1.1.2.4
+++ drbd_compat_types.h 1 Feb 2004 12:09:31 -0000 1.1.2.5
@@ -44,7 +44,7 @@
#else // LINUX 2.6
-#warning "FIXME"
+//#warning "FIXME"
typedef struct bio drbd_bio_t;
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -3 -r1.1.2.16 -r1.1.2.17
--- drbd_compat_wrappers.h 31 Jan 2004 16:54:21 -0000 1.1.2.16
+++ drbd_compat_wrappers.h 1 Feb 2004 12:09:31 -0000 1.1.2.17
@@ -313,7 +313,7 @@
set_capacity(mdev->vdisk,size);
}
-#warning "FIXME why don't we care for the return value?"
+//#warning "FIXME why don't we care for the return value?"
static inline void drbd_set_blocksize(drbd_dev *mdev, int blksize)
{
set_blocksize(mdev->this_bdev,blksize);
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_dsender.c,v
retrieving revision 1.1.2.65
retrieving revision 1.1.2.66
diff -u -3 -r1.1.2.65 -r1.1.2.66
--- drbd_dsender.c 31 Jan 2004 17:19:06 -0000 1.1.2.65
+++ drbd_dsender.c 1 Feb 2004 12:09:31 -0000 1.1.2.66
@@ -152,7 +152,7 @@
}
#else
-#warning "FIXME"
+//#warning "FIXME"
/* used for synchronous meta data and bitmap IO
* submitted by FIXME (I'd say worker only, but currently this is not true...)
*/
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_fs.c,v
retrieving revision 1.28.2.57
retrieving revision 1.28.2.58
diff -u -3 -r1.28.2.57 -r1.28.2.58
--- drbd_fs.c 30 Jan 2004 20:12:34 -0000 1.28.2.57
+++ drbd_fs.c 1 Feb 2004 12:09:31 -0000 1.28.2.58
@@ -125,7 +125,7 @@
mdev->la_size = size;
INFO("size = %lu KB\n",size);
}
-#warning "FIXME else { error handling }"
+ //#warning "FIXME else { error handling }"
}
return rv;
@@ -189,7 +189,7 @@
goto fail_ioctl;
}
-#warning "XXX size check does not care about meta data on the same device??"
+ //#warning "XXX size check does not care about meta data on the same device??"
if ((drbd_get_lo_capacity(mdev)>>1) < new_conf.disk_size) {
retcode = LDDeviceTooSmall;
goto release_bdev_fail_ioctl;
@@ -466,7 +466,7 @@
int drbd_set_state(drbd_dev *mdev,Drbd_State newstate)
{
-#warning "FIXME actually must hold device_mutex!"
+ //#warning "FIXME actually must hold device_mutex!"
NOT_IN_26(int minor = mdev-drbd_conf;)
if ( (newstate & 0x3) == mdev->state ) return 0; /* nothing to do */
@@ -694,7 +694,7 @@
mdev->lo_usize = (unsigned long)arg;
drbd_determin_dev_size(mdev);
drbd_md_write(mdev); // Write mdev->la_size to disk.
-#warning "yet an other reason to serialize all state changes on a rw_semaphore"
+ //#warning "yet an other reason to serialize all state changes on a rw_semaphore"
if (mdev->cstate == Connected) drbd_send_param(mdev);
break;
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_main.c,v
retrieving revision 1.73.2.118
retrieving revision 1.73.2.119
diff -u -3 -r1.73.2.118 -r1.73.2.119
--- drbd_main.c 31 Jan 2004 16:54:21 -0000 1.73.2.118
+++ drbd_main.c 1 Feb 2004 12:09:31 -0000 1.73.2.119
@@ -89,7 +89,7 @@
#endif
#define DEVICE_REQUEST drbd_do_request
-#warning "FIXME review the MODULE_* macros below"
+//#warning "FIXME review the MODULE_* macros below"
MODULE_AUTHOR("Philipp Reisner <philipp.reisner@gmx.at>");
MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION);
MODULE_LICENSE("GPL");
@@ -1180,6 +1180,10 @@
if (*q) blk_put_queue(*q);
*q = NULL;
+ if (mdev->this_bdev->bd_holder == drbd_sec_holder) {
+ mdev->this_bdev->bd_contains = mdev->this_bdev;
+ bd_release(mdev->this_bdev);
+ }
if (mdev->this_bdev) bdput(mdev->this_bdev);
)
@@ -1291,8 +1295,12 @@
disk->private_data = mdev;
add_disk(disk);
- // THINK do we need this?
mdev->this_bdev = bdget(MKDEV(MAJOR_NR,i));
+ mdev->this_bdev->bd_contains = mdev->this_bdev; // Hmmm ?
+ if (bd_claim(mdev->this_bdev,drbd_sec_holder)) {
+ // Initial we are Secondary -> should claim myself.
+ WARN("Could not bd_claim() myself.");
+ }
blk_queue_make_request(q,drbd_make_request);
q->unplug_fn = drbd_send_write_hint;
@@ -1420,7 +1428,7 @@
{
int i;
-#warning "FIXME increase module refcount with each setup device"
+//#warning "FIXME increase module refcount with each setup device"
/* then you need to tear down all devices
* before you can remove the module */
for (i = 0; i < minor_count; i++) {
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_req-2.4.c,v
retrieving revision 1.33.2.47
retrieving revision 1.33.2.48
diff -u -3 -r1.33.2.47 -r1.33.2.48
--- drbd_req-2.4.c 27 Jan 2004 15:51:36 -0000 1.33.2.47
+++ drbd_req-2.4.c 1 Feb 2004 12:09:32 -0000 1.33.2.48
@@ -132,7 +132,7 @@
(unsigned long)pr);
#else
//WORK_HERE
-#warning "FIXME make 2.6.x clean"
+ //#warning "FIXME make 2.6.x clean"
#endif
}
@@ -183,7 +183,7 @@
}
#else
-#warning "FIXME"
+ //#warning "FIXME"
#endif
/* what do we know?
@@ -287,7 +287,7 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
bio->b_rdev = mdev->lo_device;
#else
-#warning "FIXME"
+ //#warning "FIXME"
//WORK_HERE
/* I want to change it anyways so we never remap ... */
#endif
@@ -304,7 +304,7 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
bio->b_rdev = mdev->lo_device;
#else
-#warning "FIXME"
+ //#warning "FIXME"
//WORK_HERE
/* I want to change it anyways so we never remap ... */
#endif