[DRBD-cvs] svn commit by lars - r3029 - branches/drbd-8.0/drbd -
fixes for linux 2.6.23 * r3026 | lars | 2007-08-27 12:1
drbd-cvs at lists.linbit.com
drbd-cvs at lists.linbit.com
Mon Aug 27 21:59:45 CEST 2007
Author: lars
Date: 2007-08-27 21:59:44 +0200 (Mon, 27 Aug 2007)
New Revision: 3029
Modified:
branches/drbd-8.0/drbd/drbd_compat_wrappers.h
branches/drbd-8.0/drbd/drbd_int.h
branches/drbd-8.0/drbd/drbd_main.c
branches/drbd-8.0/drbd/drbd_nl.c
branches/drbd-8.0/drbd/drbd_receiver.c
branches/drbd-8.0/drbd/drbd_req.c
Log:
fixes for linux 2.6.23
* r3026 | lars | 2007-08-27 12:16:34 +0200
b26d16ecd9ebc748def78094dd2d3c25c69f759e DRBD: get rid of deprecated request_queue_t
in fact, that git commit was done weeks ago, but got lost in the initial back-merge
of git->svn
Modified: branches/drbd-8.0/drbd/drbd_compat_wrappers.h
===================================================================
--- branches/drbd-8.0/drbd/drbd_compat_wrappers.h 2007-08-27 19:38:47 UTC (rev 3028)
+++ branches/drbd-8.0/drbd/drbd_compat_wrappers.h 2007-08-27 19:59:44 UTC (rev 3029)
@@ -140,7 +140,7 @@
static inline void drbd_plug_device(drbd_dev *mdev)
{
- request_queue_t *q;
+ struct request_queue *q;
q = bdev_get_queue(mdev->this_bdev);
spin_lock_irq(q->queue_lock);
Modified: branches/drbd-8.0/drbd/drbd_int.h
===================================================================
--- branches/drbd-8.0/drbd/drbd_int.h 2007-08-27 19:38:47 UTC (rev 3028)
+++ branches/drbd-8.0/drbd/drbd_int.h 2007-08-27 19:59:44 UTC (rev 3029)
@@ -780,7 +780,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;
@@ -1278,9 +1278,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(drbd_dev *mdev, drbd_request_t *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(drbd_request_t *, sector_t);
@@ -1908,7 +1908,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.0/drbd/drbd_main.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_main.c 2007-08-27 19:38:47 UTC (rev 3028)
+++ branches/drbd-8.0/drbd/drbd_main.c 2007-08-27 19:59:44 UTC (rev 3029)
@@ -1924,7 +1924,7 @@
return 0;
}
-STATIC void drbd_unplug_fn(request_queue_t *q)
+STATIC void drbd_unplug_fn(struct request_queue *q)
{
drbd_dev *mdev = q->queuedata;
@@ -2232,7 +2232,7 @@
while (i--) {
drbd_dev *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;
drbd_free_resources(mdev);
@@ -2315,7 +2315,7 @@
{
drbd_dev *mdev = NULL;
struct gendisk *disk;
- request_queue_t *q;
+ struct request_queue *q;
mdev = kzalloc(sizeof(drbd_dev),GFP_KERNEL);
if(!mdev) goto Enomem;
Modified: branches/drbd-8.0/drbd/drbd_nl.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_nl.c 2007-08-27 19:38:47 UTC (rev 3028)
+++ branches/drbd-8.0/drbd/drbd_nl.c 2007-08-27 19:59:44 UTC (rev 3029)
@@ -619,8 +619,8 @@
void drbd_setup_queue_param(drbd_dev *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.0/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_receiver.c 2007-08-27 19:38:47 UTC (rev 3028)
+++ branches/drbd-8.0/drbd/drbd_receiver.c 2007-08-27 19:59:44 UTC (rev 3029)
@@ -237,7 +237,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.0/drbd/drbd_req.c
===================================================================
--- branches/drbd-8.0/drbd/drbd_req.c 2007-08-27 19:38:47 UTC (rev 3028)
+++ branches/drbd-8.0/drbd/drbd_req.c 2007-08-27 19:59:44 UTC (rev 3029)
@@ -1065,7 +1065,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 = (drbd_dev*) q->queuedata;
@@ -1142,7 +1142,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 = (drbd_dev*) q->queuedata;
unsigned int bio_offset = (unsigned int)bio->bi_sector << 9; // 32 bit
@@ -1158,7 +1158,7 @@
if (bio_size == 0) {
if (limit <= bvec->bv_len) limit = bvec->bv_len;
} else if (limit && inc_local(mdev)) {
- request_queue_t * const b = mdev->bc->backing_bdev->bd_disk->queue;
+ 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);
limit = min(limit,backing_limit);
More information about the drbd-cvs
mailing list