From 25c74e374a84e1b89a73d9a0321045f5a230e85f Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Tue, 22 Mar 2011 16:03:43 +0100 Subject: [PATCH] --- yaml --- r: 345943 b: refs/heads/master c: 058820cdd7e6c96e6656a990af2188059113735e h: refs/heads/master i: 345941: c2759a8c193ef94bac1824fc1b5b8c5527682413 345939: 26b72214bd9cba83f8150b9da3d3e8f4c96ecfc0 345935: aa71bbe731e2a52fb947f2efc59aeb0648ec96c7 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 1 - trunk/drivers/block/drbd/drbd_main.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0624a8b53a71..6d5fd7e7615f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e307f352b4a6b4411136acd8cab20f9259ba182a +refs/heads/master: 058820cdd7e6c96e6656a990af2188059113735e diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index 4f0cafa18870..d3acc1597dc7 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -1201,7 +1201,6 @@ extern int drbd_send_drequest_csum(struct drbd_conf *mdev, sector_t sector, extern int drbd_send_ov_request(struct drbd_conf *mdev,sector_t sector,int size); extern int drbd_send_bitmap(struct drbd_conf *mdev); -extern int _drbd_send_bitmap(struct drbd_conf *mdev); extern void drbd_send_sr_reply(struct drbd_conf *mdev, enum drbd_state_rv retcode); extern int conn_send_sr_reply(struct drbd_tconn *tconn, enum drbd_state_rv retcode); extern void drbd_free_bc(struct drbd_backing_dev *ldev); diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index d9828612c8e8..076ccb52e812 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1182,7 +1182,7 @@ send_bitmap_rle_or_plain(struct drbd_conf *mdev, } /* See the comment at receive_bitmap() */ -int _drbd_send_bitmap(struct drbd_conf *mdev) +static int _drbd_send_bitmap(struct drbd_conf *mdev) { struct bm_xfer_ctx c; struct p_header *p;