aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-05-24 10:27:38 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-05-24 10:38:32 +0200
commit9b2f61aec73dc9e735e247fd720c673b30999e7c (patch)
tree7d82ad8dd932c5d6a047fbfecd49aa34e8ea15a2 /drivers/block/drbd
parent24c4830c8ec3cbc904d84c213126a35f41a4e455 (diff)
downloadkernel_samsung_smdk4412-9b2f61aec73dc9e735e247fd720c673b30999e7c.zip
kernel_samsung_smdk4412-9b2f61aec73dc9e735e247fd720c673b30999e7c.tar.gz
kernel_samsung_smdk4412-9b2f61aec73dc9e735e247fd720c673b30999e7c.tar.bz2
drbd: fix warning
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r--drivers/block/drbd/drbd_nl.c2
-rw-r--r--drivers/block/drbd/drbd_receiver.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 259ca0b..515bcd9 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1342,7 +1342,7 @@ static int drbd_nl_detach(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp,
ret = wait_event_interruptible(mdev->misc_wait,
mdev->state.disk != D_FAILED);
drbd_resume_io(mdev);
- if (retcode == SS_IS_DISKLESS)
+ if ((int)retcode == (int)SS_IS_DISKLESS)
retcode = SS_NOTHING_TO_DO;
if (ret)
retcode = ERR_INTR;
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index d9f2109..25d32c5 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -2911,12 +2911,6 @@ disconnect:
return false;
}
-static void drbd_setup_order_type(struct drbd_conf *mdev, int peer)
-{
- /* sorry, we currently have no working implementation
- * of distributed TCQ */
-}
-
/* warn if the arguments differ by more than 12.5% */
static void warn_if_differ_considerably(struct drbd_conf *mdev,
const char *s, sector_t a, sector_t b)