From 2d1871ab80746f5480822b808ae22ee1ac1b3234 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Tue, 24 May 2011 10:27:38 +0200 Subject: [PATCH] --- yaml --- r: 251283 b: refs/heads/master c: 9b2f61aec73dc9e735e247fd720c673b30999e7c h: refs/heads/master i: 251281: a749b16c3dec4f184316027518d206bc4db59bb4 251279: ac3f2d292d49cbd0aa3218b5764358a61eb506e6 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_nl.c | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 81d4b888c73e..77ee6d008cc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24c4830c8ec3cbc904d84c213126a35f41a4e455 +refs/heads/master: 9b2f61aec73dc9e735e247fd720c673b30999e7c diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index 259ca0b20961..515bcd948a43 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/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/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index d9f2109fd9e6..25d32c5aa50a 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -2911,12 +2911,6 @@ static int receive_SyncParam(struct drbd_conf *mdev, enum drbd_packets cmd, unsi 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)