[DRBD-cvs] svn commit by lars - r3026 - branches/drbd-8.1/drbd - b26d16ecd9ebc748def78094dd2d3c25c69f759e DRBD: get rid

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2007-08-27 12:16:34 +0200 (Mon, 27 Aug 2007)
New Revision: 3026

Modified:
   branches/drbd-8.1/drbd/drbd_int.h
   branches/drbd-8.1/drbd/drbd_main.c
   branches/drbd-8.1/drbd/drbd_nl.c
   branches/drbd-8.1/drbd/drbd_receiver.c
   branches/drbd-8.1/drbd/drbd_req.c
   branches/drbd-8.1/drbd/drbd_wrappers.h
Log:
b26d16ecd9ebc748def78094dd2d3c25c69f759e DRBD: get rid of deprecated request_queue_t

Modified: branches/drbd-8.1/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.1/drbd/drbd_int.h	2007-08-27 10:12:02 UTC (rev 3025)
+++ branches/drbd-8.1/drbd/drbd_int.h	2007-08-27 10:16:34 UTC (rev 3026)
@@ -777,7 +777,7 @@
 	struct drbd_backing_dev *bc; /* protected by inc_local() dec_local() */
 
 	sector_t p_size;     /* partner's disk size */
-	request_queue_t     *rq_queue;
+	struct request_queue *rq_queue;
 	struct block_device *this_bdev;
 	struct gendisk	    *vdisk;
 
@@ -1300,9 +1300,9 @@
 #endif
 
 /* drbd_req */
-extern int drbd_make_request_26(request_queue_t *q, struct bio *bio);
+extern int drbd_make_request_26(struct request_queue *q, struct bio *bio);
 extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req);
-extern int drbd_merge_bvec(request_queue_t *, struct bio *, struct bio_vec *);
+extern int drbd_merge_bvec(struct request_queue *, struct bio *, struct bio_vec *);
 extern int is_valid_ar_handle(struct drbd_request *, sector_t);
 
 
@@ -1923,7 +1923,7 @@
  * d) q->unplug_fn(q), which is what all the drivers/md/ stuff uses...
  *
  */
-static inline void drbd_blk_run_queue(request_queue_t *q)
+static inline void drbd_blk_run_queue(struct request_queue *q)
 {
 	if (q && q->unplug_fn)
 		q->unplug_fn(q);

Modified: branches/drbd-8.1/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.1/drbd/drbd_main.c	2007-08-27 10:12:02 UTC (rev 3025)
+++ branches/drbd-8.1/drbd/drbd_main.c	2007-08-27 10:16:34 UTC (rev 3026)
@@ -1951,7 +1951,7 @@
 	return 0;
 }
 
-void drbd_unplug_fn(request_queue_t *q)
+void drbd_unplug_fn(struct request_queue *q)
 {
 	struct drbd_conf *mdev = q->queuedata;
 
@@ -2262,7 +2262,7 @@
 		while (i--) {
 			struct drbd_conf        *mdev  = minor_to_mdev(i);
 			struct gendisk  **disk = &mdev->vdisk;
-			request_queue_t **q    = &mdev->rq_queue;
+			struct request_queue **q    = &mdev->rq_queue;
 
 			if (!mdev)
 				continue;
@@ -2351,7 +2351,7 @@
 {
 	struct drbd_conf *mdev = NULL;
 	struct gendisk *disk;
-	request_queue_t *q;
+	struct request_queue *q;
 
 	mdev = kzalloc(sizeof(struct drbd_conf), GFP_KERNEL);
 	if (!mdev)

Modified: branches/drbd-8.1/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.1/drbd/drbd_nl.c	2007-08-27 10:12:02 UTC (rev 3025)
+++ branches/drbd-8.1/drbd/drbd_nl.c	2007-08-27 10:16:34 UTC (rev 3026)
@@ -632,8 +632,8 @@
 
 void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s)
 {
-	request_queue_t * const q = mdev->rq_queue;
-	request_queue_t * const b = mdev->bc->backing_bdev->bd_disk->queue;
+	struct request_queue * const q = mdev->rq_queue;
+	struct request_queue * const b = mdev->bc->backing_bdev->bd_disk->queue;
 	/* unsigned int old_max_seg_s = q->max_segment_size; */
 
 	if (b->merge_bvec_fn && !mdev->bc->dc.use_bmbv)

Modified: branches/drbd-8.1/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.1/drbd/drbd_receiver.c	2007-08-27 10:12:02 UTC (rev 3025)
+++ branches/drbd-8.1/drbd/drbd_receiver.c	2007-08-27 10:16:34 UTC (rev 3026)
@@ -193,7 +193,7 @@
 				     unsigned int data_size,
 				     unsigned int gfp_mask)
 {
-	request_queue_t *q;
+	struct request_queue *q;
 	struct Tl_epoch_entry *e;
 	struct bio_vec *bvec;
 	struct page *page;

Modified: branches/drbd-8.1/drbd/drbd_req.c
===================================================================
--- branches/drbd-8.1/drbd/drbd_req.c	2007-08-27 10:12:02 UTC (rev 3025)
+++ branches/drbd-8.1/drbd/drbd_req.c	2007-08-27 10:16:34 UTC (rev 3026)
@@ -1086,7 +1086,7 @@
 	return 0;
 }
 
-int drbd_make_request_26(request_queue_t *q, struct bio *bio)
+int drbd_make_request_26(struct request_queue *q, struct bio *bio)
 {
 	unsigned int s_enr, e_enr;
 	struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata;
@@ -1164,7 +1164,7 @@
  */
 /* FIXME for two_primaries,
  * we should use DRBD_MAX_SEGMENT_SIZE instead of AL_EXTENT_SIZE */
-int drbd_merge_bvec(request_queue_t *q, struct bio *bio, struct bio_vec *bvec)
+int drbd_merge_bvec(struct request_queue *q, struct bio *bio, struct bio_vec *bvec)
 {
 	struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata;
 	unsigned int bio_offset =
@@ -1180,7 +1180,7 @@
 		if (limit <= bvec->bv_len)
 			limit = bvec->bv_len;
 	} else if (limit && inc_local(mdev)) {
-		request_queue_t * const b =
+		struct request_queue * const b =
 			mdev->bc->backing_bdev->bd_disk->queue;
 		if (b->merge_bvec_fn && mdev->bc->dc.use_bmbv) {
 			backing_limit = b->merge_bvec_fn(b, bio, bvec);

Modified: branches/drbd-8.1/drbd/drbd_wrappers.h
===================================================================
--- branches/drbd-8.1/drbd/drbd_wrappers.h	2007-08-27 10:12:02 UTC (rev 3025)
+++ branches/drbd-8.1/drbd/drbd_wrappers.h	2007-08-27 10:16:34 UTC (rev 3026)
@@ -134,7 +134,7 @@
 
 static inline void drbd_plug_device(struct drbd_conf *mdev)
 {
-	request_queue_t *q;
+	struct request_queue *q;
 	q = bdev_get_queue(mdev->this_bdev);
 
 	spin_lock_irq(q->queue_lock);