diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-24 04:27:38 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2011-05-24 04:38:32 -0400 |
commit | 9b2f61aec73dc9e735e247fd720c673b30999e7c (patch) | |
tree | 7d82ad8dd932c5d6a047fbfecd49aa34e8ea15a2 /drivers/block | |
parent | 24c4830c8ec3cbc904d84c213126a35f41a4e455 (diff) |
drbd: fix warning
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 2 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 259ca0b20961..515bcd948a43 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, | |||
1342 | ret = wait_event_interruptible(mdev->misc_wait, | 1342 | ret = wait_event_interruptible(mdev->misc_wait, |
1343 | mdev->state.disk != D_FAILED); | 1343 | mdev->state.disk != D_FAILED); |
1344 | drbd_resume_io(mdev); | 1344 | drbd_resume_io(mdev); |
1345 | if (retcode == SS_IS_DISKLESS) | 1345 | if ((int)retcode == (int)SS_IS_DISKLESS) |
1346 | retcode = SS_NOTHING_TO_DO; | 1346 | retcode = SS_NOTHING_TO_DO; |
1347 | if (ret) | 1347 | if (ret) |
1348 | retcode = ERR_INTR; | 1348 | retcode = ERR_INTR; |
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index d9f2109fd9e6..25d32c5aa50a 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -2911,12 +2911,6 @@ disconnect: | |||
2911 | return false; | 2911 | return false; |
2912 | } | 2912 | } |
2913 | 2913 | ||
2914 | static void drbd_setup_order_type(struct drbd_conf *mdev, int peer) | ||
2915 | { | ||
2916 | /* sorry, we currently have no working implementation | ||
2917 | * of distributed TCQ */ | ||
2918 | } | ||
2919 | |||
2920 | /* warn if the arguments differ by more than 12.5% */ | 2914 | /* warn if the arguments differ by more than 12.5% */ |
2921 | static void warn_if_differ_considerably(struct drbd_conf *mdev, | 2915 | static void warn_if_differ_considerably(struct drbd_conf *mdev, |
2922 | const char *s, sector_t a, sector_t b) | 2916 | const char *s, sector_t a, sector_t b) |