Skip to content

Commit

Permalink
drbd: Remove unused function atodb_endio()
Browse files Browse the repository at this point in the history
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Andreas Gruenbacher authored and Philipp Reisner committed Mar 10, 2011
1 parent fdda654 commit c5a9161
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 37 deletions.
27 changes: 0 additions & 27 deletions drivers/block/drbd/drbd_actlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -542,33 +542,6 @@ int drbd_al_read_log(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
return 1;
}

static void atodb_endio(struct bio *bio, int error)
{
struct drbd_atodb_wait *wc = bio->bi_private;
struct drbd_conf *mdev = wc->mdev;
struct page *page;
int uptodate = bio_flagged(bio, BIO_UPTODATE);

/* strange behavior of some lower level drivers...
* fail the request by clearing the uptodate flag,
* but do not return any error?! */
if (!error && !uptodate)
error = -EIO;

drbd_chk_io_error(mdev, error, true);
if (error && wc->error == 0)
wc->error = error;

if (atomic_dec_and_test(&wc->count))
complete(&wc->io_done);

page = bio->bi_io_vec[0].bv_page;
put_page(page);
bio_put(bio);
mdev->bm_writ_cnt++;
put_ldev(mdev);
}

/**
* drbd_al_apply_to_bm() - Sets the bitmap to diry(1) where covered ba active AL extents
* @mdev: DRBD device.
Expand Down
15 changes: 6 additions & 9 deletions drivers/block/drbd/drbd_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,12 @@ static int w_make_resync_request(struct drbd_conf *mdev,



/* defined here:
drbd_md_io_complete
drbd_endio_sec
drbd_endio_pri
* more endio handlers:
atodb_endio in drbd_actlog.c
drbd_bm_async_io_complete in drbd_bitmap.c
/* endio handlers:
* drbd_md_io_complete (defined here)
* drbd_endio_pri (defined here)
* drbd_endio_sec (defined here)
* bm_async_io_complete (defined in drbd_bitmap.c)
*
* For all these callbacks, note the following:
* The callbacks will be called in irq context by the IDE drivers,
* and in Softirqs/Tasklets/BH context by the SCSI drivers.
Expand Down
2 changes: 1 addition & 1 deletion include/linux/drbd.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@


extern const char *drbd_buildtag(void);
#define REL_VERSION "8.3.9"
#define REL_VERSION "8.3.10"
#define API_VERSION 88
#define PRO_VERSION_MIN 86
#define PRO_VERSION_MAX 96
Expand Down

0 comments on commit c5a9161

Please sign in to comment.