From 1cd0b6fb36ea78bedef12f197b48b93cd660a5d9 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 16 Mar 2011 01:39:44 +0100 Subject: [PATCH] --- yaml --- r: 345912 b: refs/heads/master c: 73218a3c4c7ae87014b8fc258f8a16a75aad2870 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 2 +- trunk/drivers/block/drbd/drbd_worker.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f59ddb6776cc..fb5bffab1627 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db1b0b724e56f34608b76197191ef0577a1ddd45 +refs/heads/master: 73218a3c4c7ae87014b8fc258f8a16a75aad2870 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 779bf5b10d5a..93805354eec4 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -1640,7 +1640,7 @@ int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req) p.sector = cpu_to_be64(req->i.sector); p.blksize = cpu_to_be32(req->i.size); - return !drbd_send_cmd(mdev, &mdev->tconn->data, P_OUT_OF_SYNC, &p.head, sizeof(p)); + return drbd_send_cmd(mdev, &mdev->tconn->data, P_OUT_OF_SYNC, &p.head, sizeof(p)); } /* diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index a529ffe213a6..3a2c51fd8ea0 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/drivers/block/drbd/drbd_worker.c @@ -1241,7 +1241,7 @@ int w_send_oos(struct drbd_work *w, int cancel) return 1; } - ok = drbd_send_oos(mdev, req); + ok = !drbd_send_oos(mdev, req); req_mod(req, OOS_HANDED_TO_NETWORK); return ok;