From 9dc3f127e66572f6d9576ba2c5064d716d7b7d33 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 16:08:22 +0100 Subject: [PATCH] --- yaml --- r: 345919 b: refs/heads/master c: a896527c0658f9073413d46c2401448cdc0427ff h: refs/heads/master i: 345917: 3aa27c07c0f605c36514091035dbcdfa8154d95a 345915: 9705b117e07f6766013cc4e695fd14d1600ad892 345911: 8a64662e9848339565f49b74513e343b3e501bd2 345903: e14a774c40ea75330d37cac5a6c204c31e9b40dc 345887: 736d9dbfc30939d61a46676cd0bcf0b6dd4f56b2 345855: 7dcdeb1fef61092eeba92df0338d84f3aabaef16 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 2 +- trunk/drivers/block/drbd/drbd_worker.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 39d1b23debc1..d7f7e14ac3da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6bdb9b0e230aae94b084d8a375363ada056653b5 +refs/heads/master: a896527c0658f9073413d46c2401448cdc0427ff diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index bcb3bc25a722..173fed633e28 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -1937,7 +1937,7 @@ static inline int drbd_send_short_cmd(struct drbd_conf *mdev, enum drbd_packet cmd) { struct p_header h; - return !drbd_send_cmd(mdev, &mdev->tconn->data, cmd, &h, sizeof(h)); + return drbd_send_cmd(mdev, &mdev->tconn->data, cmd, &h, sizeof(h)); } static inline int drbd_send_ping(struct drbd_tconn *tconn) diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index b42ba1af8068..0dd2f2d81de2 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/drivers/block/drbd/drbd_worker.c @@ -1227,7 +1227,7 @@ int w_send_write_hint(struct drbd_work *w, int cancel) struct drbd_conf *mdev = w->mdev; if (cancel) return 1; - return drbd_send_short_cmd(mdev, P_UNPLUG_REMOTE); + return !drbd_send_short_cmd(mdev, P_UNPLUG_REMOTE); } int w_send_oos(struct drbd_work *w, int cancel)