From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753342Ab1IELs6 (ORCPT ); Mon, 5 Sep 2011 07:48:58 -0400 Received: from mail09.linbit.com ([212.69.161.110]:59852 "EHLO mail09.linbit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768Ab1IELqE (ORCPT ); Mon, 5 Sep 2011 07:46:04 -0400 From: Philipp Reisner To: linux-kernel@vger.kernel.org, Jens Axboe Cc: drbd-dev@lists.linbit.com Subject: [PATCH 31/54] drbd: drbd_send_block(): Return 0 upon success and an error code otherwise Date: Mon, 5 Sep 2011 13:45:22 +0200 Message-Id: <1315223145-20640-32-git-send-email-philipp.reisner@linbit.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1315223145-20640-1-git-send-email-philipp.reisner@linbit.com> References: <1315223145-20640-1-git-send-email-philipp.reisner@linbit.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Gruenbacher Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_main.c | 23 ++++++++++++----------- drivers/block/drbd/drbd_worker.c | 6 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 1b61727..9b53d86 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -1610,7 +1610,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd, struct drbd_peer_request *peer_req) { - int ok; + int err; struct p_data p; void *dgb; int dgs; @@ -1629,21 +1629,22 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packet cmd, * This one may be interrupted by DRBD_SIG and/or DRBD_SIGKILL * in response to admin command or module unload. */ - if (drbd_get_data_sock(mdev->tconn)) - return 0; - - ok = sizeof(p) == drbd_send(mdev->tconn, mdev->tconn->data.socket, &p, sizeof(p), dgs ? MSG_MORE : 0); - if (ok && dgs) { + err = drbd_get_data_sock(mdev->tconn); + if (err) + return err; + err = drbd_send_all(mdev->tconn, mdev->tconn->data.socket, &p, + sizeof(p), dgs ? MSG_MORE : 0); + if (!err && dgs) { dgb = mdev->tconn->int_dig_out; drbd_csum_ee(mdev, mdev->tconn->integrity_w_tfm, peer_req, dgb); - ok = dgs == drbd_send(mdev->tconn, mdev->tconn->data.socket, dgb, dgs, 0); + err = drbd_send_all(mdev->tconn, mdev->tconn->data.socket, dgb, + dgs, 0); } - if (ok) - ok = !_drbd_send_zc_ee(mdev, peer_req); - + if (!err) + err = _drbd_send_zc_ee(mdev, peer_req); drbd_put_data_sock(mdev->tconn); - return ok; + return err; } int drbd_send_oos(struct drbd_conf *mdev, struct drbd_request *req) diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index a64cb99..2528f3d 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -920,7 +920,7 @@ int w_e_end_data_req(struct drbd_work *w, int cancel) } if (likely((peer_req->flags & EE_WAS_ERROR) == 0)) { - ok = drbd_send_block(mdev, P_DATA_REPLY, peer_req); + ok = !drbd_send_block(mdev, P_DATA_REPLY, peer_req); } else { if (__ratelimit(&drbd_ratelimit_state)) dev_err(DEV, "Sending NegDReply. sector=%llus.\n", @@ -966,7 +966,7 @@ int w_e_end_rsdata_req(struct drbd_work *w, int cancel) } else if (likely((peer_req->flags & EE_WAS_ERROR) == 0)) { if (likely(mdev->state.pdsk >= D_INCONSISTENT)) { inc_rs_pending(mdev); - ok = drbd_send_block(mdev, P_RS_DATA_REPLY, peer_req); + ok = !drbd_send_block(mdev, P_RS_DATA_REPLY, peer_req); } else { if (__ratelimit(&drbd_ratelimit_state)) dev_err(DEV, "Not sending RSDataReply, " @@ -1040,7 +1040,7 @@ int w_e_end_csum_rs_req(struct drbd_work *w, int cancel) peer_req->block_id = ID_SYNCER; /* By setting block_id, digest pointer becomes invalid! */ peer_req->flags &= ~EE_HAS_DIGEST; /* This peer request no longer has a digest pointer */ kfree(di); - ok = drbd_send_block(mdev, P_RS_DATA_REPLY, peer_req); + ok = !drbd_send_block(mdev, P_RS_DATA_REPLY, peer_req); } } else { ok = !drbd_send_ack(mdev, P_NEG_RS_DREPLY, peer_req); -- 1.7.4.1