aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-01-25 11:33:38 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-03-10 05:48:15 -0500
commitc5a91619793d444e5103ec5841045bf878718398 (patch)
tree3a1457aaaba954610b8bd55f27b8f4e9997bf936 /drivers/block
parentfdda6544ad4d3284246e717b7108f7f497b45295 (diff)
drbd: Remove unused function atodb_endio()
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_actlog.c27
-rw-r--r--drivers/block/drbd/drbd_worker.c15
2 files changed, 6 insertions, 36 deletions
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index a6050791401b..2a1642bc451d 100644
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -542,33 +542,6 @@ cancel:
542 return 1; 542 return 1;
543} 543}
544 544
545static void atodb_endio(struct bio *bio, int error)
546{
547 struct drbd_atodb_wait *wc = bio->bi_private;
548 struct drbd_conf *mdev = wc->mdev;
549 struct page *page;
550 int uptodate = bio_flagged(bio, BIO_UPTODATE);
551
552 /* strange behavior of some lower level drivers...
553 * fail the request by clearing the uptodate flag,
554 * but do not return any error?! */
555 if (!error && !uptodate)
556 error = -EIO;
557
558 drbd_chk_io_error(mdev, error, true);
559 if (error && wc->error == 0)
560 wc->error = error;
561
562 if (atomic_dec_and_test(&wc->count))
563 complete(&wc->io_done);
564
565 page = bio->bi_io_vec[0].bv_page;
566 put_page(page);
567 bio_put(bio);
568 mdev->bm_writ_cnt++;
569 put_ldev(mdev);
570}
571
572/** 545/**
573 * drbd_al_apply_to_bm() - Sets the bitmap to diry(1) where covered ba active AL extents 546 * drbd_al_apply_to_bm() - Sets the bitmap to diry(1) where covered ba active AL extents
574 * @mdev: DRBD device. 547 * @mdev: DRBD device.
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index cfd324b9f95b..3d70d8d015d9 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -44,15 +44,12 @@ static int w_make_resync_request(struct drbd_conf *mdev,
44 44
45 45
46 46
47/* defined here: 47/* endio handlers:
48 drbd_md_io_complete 48 * drbd_md_io_complete (defined here)
49 drbd_endio_sec 49 * drbd_endio_pri (defined here)
50 drbd_endio_pri 50 * drbd_endio_sec (defined here)
51 51 * bm_async_io_complete (defined in drbd_bitmap.c)
52 * more endio handlers: 52 *
53 atodb_endio in drbd_actlog.c
54 drbd_bm_async_io_complete in drbd_bitmap.c
55
56 * For all these callbacks, note the following: 53 * For all these callbacks, note the following:
57 * The callbacks will be called in irq context by the IDE drivers, 54 * The callbacks will be called in irq context by the IDE drivers,
58 * and in Softirqs/Tasklets/BH context by the SCSI drivers. 55 * and in Softirqs/Tasklets/BH context by the SCSI drivers.