summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-cluster/drbd/files/drbd-0.7-bio.patch')
-rw-r--r--sys-cluster/drbd/files/drbd-0.7-bio.patch235
1 files changed, 235 insertions, 0 deletions
diff --git a/sys-cluster/drbd/files/drbd-0.7-bio.patch b/sys-cluster/drbd/files/drbd-0.7-bio.patch
new file mode 100644
index 000000000000..fecf52e84660
--- /dev/null
+++ b/sys-cluster/drbd/files/drbd-0.7-bio.patch
@@ -0,0 +1,235 @@
+diff -uNr drbd-0.7.8.old/drbd/drbd_actlog.c drbd-0.7.8/drbd/drbd_actlog.c
+--- drbd-0.7.8.old/drbd/drbd_actlog.c 2004-11-25 09:05:00.000000000 +0100
++++ drbd-0.7.8/drbd/drbd_actlog.c 2005-01-25 12:29:04.938306416 +0100
+@@ -64,35 +64,29 @@
+ STATIC int _drbd_md_sync_page_io(drbd_dev *mdev, struct page *page,
+ sector_t sector, int rw, int size)
+ {
+- struct bio bio;
+- struct bio_vec vec;
++ struct bio *bio = bio_alloc(GFP_KERNEL, 1);
+ struct completion event;
+ int ok;
+
+- bio_init(&bio);
+- bio.bi_io_vec = &vec;
+- vec.bv_page = page;
+- vec.bv_offset = 0;
+- vec.bv_len =
+- bio.bi_size = size;
+- bio.bi_vcnt = 1;
+- bio.bi_idx = 0;
+- bio.bi_bdev = mdev->md_bdev;
+- bio.bi_sector = sector;
++ bio_get(bio);
++
++ bio->bi_bdev = mdev->md_bdev;
++ bio->bi_sector = sector;
++ bio_add_page(bio, page, size, 0);
+ init_completion(&event);
+- bio.bi_private = &event;
+- bio.bi_end_io = drbd_md_io_complete;
++ bio->bi_private = &event;
++ bio->bi_end_io = drbd_md_io_complete;
+
+ #ifdef BIO_RW_SYNC
+- submit_bio(rw | (1 << BIO_RW_SYNC), &bio);
++ submit_bio(rw | (1 << BIO_RW_SYNC), bio);
+ #else
+- submit_bio(rw, &bio);
++ submit_bio(rw, bio);
+ drbd_blk_run_queue(bdev_get_queue(mdev->md_bdev));
+ #endif
+ wait_for_completion(&event);
+
+- ok = test_bit(BIO_UPTODATE, &bio.bi_flags);
+-
++ ok = test_bit(BIO_UPTODATE, &bio->bi_flags);
++ bio_put(bio);
+ return ok;
+ }
+ #endif
+diff -uNr drbd-0.7.8.old/drbd/drbd_compat_wrappers.h drbd-0.7.8/drbd/drbd_compat_wrappers.h
+--- drbd-0.7.8.old/drbd/drbd_compat_wrappers.h 2004-09-29 11:21:03.000000000 +0200
++++ drbd-0.7.8/drbd/drbd_compat_wrappers.h 2005-01-25 12:29:04.940306112 +0100
+@@ -429,11 +429,9 @@
+ */
+ static inline char *drbd_bio_kmap(struct bio *bio)
+ {
+- struct bio_vec *bvec;
++ struct bio_vec *bvec = bio_iovec(bio);
+ unsigned long addr;
+
+- bvec = bio_iovec_idx(bio, bio->bi_idx);
+-
+ addr = (unsigned long) kmap(bvec->bv_page);
+
+ if (addr & ~PAGE_MASK)
+@@ -444,16 +442,15 @@
+
+ static inline void drbd_bio_kunmap(struct bio *bio)
+ {
+- struct bio_vec *bvec;
++ struct bio_vec *bvec = bio_iovec(bio);
+
+- bvec = bio_iovec_idx(bio, bio->bi_idx);
+ kunmap(bvec->bv_page);
+ }
+
+ #else
+ static inline char *drbd_bio_kmap(struct bio *bio)
+ {
+- struct bio_vec *bvec = bio_iovec_idx(bio, bio->bi_idx);
++ struct bio_vec *bvec = bio_iovec(bio);
+ return page_address(bvec->bv_page) + bvec->bv_offset;
+ }
+ static inline void drbd_bio_kunmap(struct bio *bio)
+@@ -466,16 +463,16 @@
+ {
+ struct bio * const bio = &e->private_bio;
+ struct bio_vec * const vec = &e->ee_bvec;
++
+ memset(e, 0, sizeof(*e));
++ bio_init(bio);
+
+- // bio_init(&bio); memset did it for us.
+ bio->bi_io_vec = vec;
+- vec->bv_page = page;
+- vec->bv_len =
+- bio->bi_size = PAGE_SIZE;
+- bio->bi_max_vecs = 1;
+ bio->bi_destructor = NULL;
+- atomic_set(&bio->bi_cnt, 1);
++ vec->bv_page = page;
++ bio->bi_size = vec->bv_len = PAGE_SIZE;
++ bio->bi_max_vecs = bio->bi_vcnt = 1;
++ vec->bv_offset = 0;
+
+ e->block_id = ID_VACANT;
+ }
+@@ -495,20 +492,24 @@
+ sector_t sector, int size)
+ {
+ struct bio * const bio = &e->private_bio;
+-
++ struct bio_vec * const vec = &e->ee_bvec;
++ struct page * const page = vec->bv_page;
+ D_ASSERT(mdev->backing_bdev);
+
+- bio->bi_flags = 1 << BIO_UPTODATE;
+- bio->bi_io_vec->bv_len =
+- bio->bi_size = size;
+- bio->bi_bdev = mdev->backing_bdev;
+- bio->bi_sector = sector;
++ /* Clear plate. */
++ bio_init(bio);
++
++ bio->bi_io_vec = vec;
++ bio->bi_destructor = NULL;
++ vec->bv_page = page;
++ vec->bv_offset = 0;
++ bio->bi_max_vecs = bio->bi_vcnt = 1;
++
++ bio->bi_bdev = mdev->backing_bdev;
+ bio->bi_private = mdev;
+- bio->bi_next = 0;
+- bio->bi_idx = 0; // for blk_recount_segments
+- bio->bi_vcnt = 1; // for blk_recount_segments
+- e->ee_sector = sector;
+- e->ee_size = size;
++
++ e->ee_sector = bio->bi_sector = sector;
++ e->ee_size = bio->bi_size = bio->bi_io_vec->bv_len = size;
+ }
+
+ static inline void
+@@ -530,15 +531,19 @@
+ static inline void
+ drbd_req_prepare_write(drbd_dev *mdev, struct drbd_request *req)
+ {
+- struct bio * const bio = &req->private_bio;
+- struct bio * const bio_src = req->master_bio;
++ struct bio * const bio = &req->private_bio;
++ struct bio_vec * const bvec = &req->req_bvec;
++ struct bio * const bio_src = req->master_bio;
+
+ bio_init(bio); // bio->bi_flags = 0;
++ bio->bi_io_vec = bvec;
++ bio->bi_max_vecs = 1;
++
+ __bio_clone(bio,bio_src);
+ bio->bi_bdev = mdev->backing_bdev;
+ bio->bi_private = mdev;
+ bio->bi_end_io = drbd_dio_end;
+- bio->bi_next = 0;
++ bio->bi_next = NULL;
+
+ req->rq_status = RQ_DRBD_NOTHING;
+ }
+@@ -546,22 +551,26 @@
+ static inline void
+ drbd_req_prepare_read(drbd_dev *mdev, struct drbd_request *req)
+ {
+- struct bio * const bio = &req->private_bio;
+- struct bio * const bio_src = req->master_bio;
++ struct bio * const bio = &req->private_bio;
++ struct bio_vec * const bvec = &req->req_bvec;
++ struct bio * const bio_src = req->master_bio;
+
+ bio_init(bio); // bio->bi_flags = 0;
++ bio->bi_io_vec = bvec;
++ bio->bi_max_vecs = 1;
++
+ __bio_clone(bio,bio_src);
+ bio->bi_bdev = mdev->backing_bdev;
+ bio->bi_private = mdev;
+ bio->bi_end_io = drbd_read_bi_end_io; // <- only difference
+- bio->bi_next = 0;
++ bio->bi_next = NULL;
+
+ req->rq_status = RQ_DRBD_NOTHING;
+ }
+
+ static inline struct page* drbd_bio_get_page(struct bio *bio)
+ {
+- struct bio_vec *bvec = bio_iovec_idx(bio, bio->bi_idx);
++ struct bio_vec *bvec = bio_iovec(bio);
+ return bvec->bv_page;
+ }
+
+@@ -622,13 +631,13 @@
+
+ static inline int _drbd_send_zc_bio(drbd_dev *mdev, struct bio *bio)
+ {
+- struct bio_vec *bvec = bio_iovec_idx(bio, bio->bi_idx);
++ struct bio_vec *bvec = bio_iovec(bio);
+ return _drbd_send_page(mdev,bvec->bv_page,bvec->bv_offset,bvec->bv_len);
+ }
+
+ static inline int _drbd_send_bio(drbd_dev *mdev, struct bio *bio)
+ {
+- struct bio_vec *bvec = bio_iovec_idx(bio, bio->bi_idx);
++ struct bio_vec *bvec = bio_iovec(bio);
+ struct page *page = bvec->bv_page;
+ size_t size = bvec->bv_len;
+ int offset = bvec->bv_offset;
+diff -uNr drbd-0.7.8.old/drbd/drbd_int.h drbd-0.7.8/drbd/drbd_int.h
+--- drbd-0.7.8.old/drbd/drbd_int.h 2005-01-12 10:50:37.000000000 +0100
++++ drbd-0.7.8/drbd/drbd_int.h 2005-01-25 12:29:04.943305656 +0100
+@@ -630,6 +630,7 @@
+ struct drbd_barrier *barrier; // The next barrier.
+ drbd_bio_t *master_bio; // master bio pointer
+ drbd_bio_t private_bio; // private bio struct
++ ONLY_IN_26(struct bio_vec req_bvec;)
+ };
+
+ struct drbd_barrier {
+@@ -669,7 +670,7 @@
+ long magic;
+ ONLY_IN_26(unsigned int ee_size;)
+ ONLY_IN_26(sector_t ee_sector;)
+- // THINK: maybe we rather want bio_alloc(GFP_*,1)
++ // TODO: we rather want bio_alloc(GFP_*,1) all through the code!
+ ONLY_IN_26(struct bio_vec ee_bvec;)
+ };
+