From: Philipp Reisner <philipp.reisner@linbit.com>
To: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com
Subject: [PATCH 11/16] drbd: Separate connection state changes from minor dev state changes #2
Date: Fri, 2 Sep 2011 12:00:43 +0200 [thread overview]
Message-ID: <1314957648-13242-12-git-send-email-philipp.reisner@linbit.com> (raw)
In-Reply-To: <1314957648-13242-1-git-send-email-philipp.reisner@linbit.com>
New function got_conn_RqSReply()
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
drivers/block/drbd/drbd_receiver.c | 47 ++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index e28f194..5fd78f4 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4415,32 +4415,37 @@ int drbdd_init(struct drbd_thread *thi)
/* ********* acknowledge sender ******** */
+static int got_conn_RqSReply(struct drbd_tconn *tconn, enum drbd_packet cmd)
+{
+ struct p_req_state_reply *p = &tconn->meta.rbuf.req_state_reply;
+ int retcode = be32_to_cpu(p->retcode);
+
+ if (retcode >= SS_SUCCESS) {
+ set_bit(CONN_WD_ST_CHG_OKAY, &tconn->flags);
+ } else {
+ set_bit(CONN_WD_ST_CHG_FAIL, &tconn->flags);
+ conn_err(tconn, "Requested state change failed by peer: %s (%d)\n",
+ drbd_set_st_err_str(retcode), retcode);
+ }
+ wake_up(&tconn->ping_wait);
+
+ return true;
+}
+
static int got_RqSReply(struct drbd_conf *mdev, enum drbd_packet cmd)
{
struct p_req_state_reply *p = &mdev->tconn->meta.rbuf.req_state_reply;
- struct drbd_tconn *tconn = mdev->tconn;
-
int retcode = be32_to_cpu(p->retcode);
- if (cmd == P_STATE_CHG_REPLY) {
- if (retcode >= SS_SUCCESS) {
- set_bit(CL_ST_CHG_SUCCESS, &mdev->flags);
- } else {
- set_bit(CL_ST_CHG_FAIL, &mdev->flags);
- dev_err(DEV, "Requested state change failed by peer: %s (%d)\n",
- drbd_set_st_err_str(retcode), retcode);
- }
- wake_up(&mdev->state_wait);
- } else /* conn == P_CONN_ST_CHG_REPLY */ {
- if (retcode >= SS_SUCCESS) {
- set_bit(CONN_WD_ST_CHG_OKAY, &tconn->flags);
- } else {
- set_bit(CONN_WD_ST_CHG_FAIL, &tconn->flags);
- conn_err(tconn, "Requested state change failed by peer: %s (%d)\n",
- drbd_set_st_err_str(retcode), retcode);
- }
- wake_up(&tconn->ping_wait);
+ if (retcode >= SS_SUCCESS) {
+ set_bit(CL_ST_CHG_SUCCESS, &mdev->flags);
+ } else {
+ set_bit(CL_ST_CHG_FAIL, &mdev->flags);
+ dev_err(DEV, "Requested state change failed by peer: %s (%d)\n",
+ drbd_set_st_err_str(retcode), retcode);
}
+ wake_up(&mdev->state_wait);
+
return true;
}
@@ -4746,7 +4751,7 @@ static struct asender_cmd asender_tbl[] = {
[P_RS_IS_IN_SYNC] = { sizeof(struct p_block_ack), MDEV, { got_IsInSync } },
[P_DELAY_PROBE] = { sizeof(struct p_delay_probe93), MDEV, { got_skip } },
[P_RS_CANCEL] = { sizeof(struct p_block_ack), MDEV, { got_NegRSDReply } },
- [P_CONN_ST_CHG_REPLY]={ sizeof(struct p_req_state_reply), MDEV, { got_RqSReply } },
+ [P_CONN_ST_CHG_REPLY]={ sizeof(struct p_req_state_reply), CONN, {.conn_fn = got_conn_RqSReply}},
[P_RETRY_WRITE] = { sizeof(struct p_block_ack), MDEV, { got_BlockAck } },
};
--
1.7.4.1
next prev parent reply other threads:[~2011-09-02 10:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-02 10:00 [RFC 00/16] drbd: part 5 of adding multiple volume support to drbd Philipp Reisner
2011-09-02 10:00 ` [PATCH 01/16] drbd: process_done_ee() has to handle unconfigured devices now Philipp Reisner
2011-09-02 10:00 ` [PATCH 02/16] drbd: New minors have to intherit the connection state form their connection Philipp Reisner
2011-09-02 10:00 ` [PATCH 03/16] drbd: Allow two diskless minors to be connected Philipp Reisner
2011-09-02 10:00 ` [PATCH 04/16] drbd: Do not modify the connection state with something else that conn_request_state() Philipp Reisner
2011-09-02 10:00 ` [PATCH 05/16] drbd: Moved CONN_DRY_RUN to the per connection (tconn) flags Philipp Reisner
2011-09-02 10:00 ` [PATCH 06/16] drbd: Allow packet handler functions that take a connection Philipp Reisner
2011-09-02 10:00 ` [PATCH 07/16] drbd: Converted receive_protocol() from mdev to tconn Philipp Reisner
2011-09-02 10:00 ` [PATCH 08/16] drbd: Separate connection state changes from minor dev state changes #1 Philipp Reisner
2011-09-02 10:00 ` [PATCH 09/16] drbd: Allow packet handler functions that take a connection (meta connection) Philipp Reisner
2011-09-02 10:00 ` [PATCH 10/16] drbd: Converted got_Ping() and got_PingAck() from mdev to tconn Philipp Reisner
2011-09-02 10:00 ` Philipp Reisner [this message]
2011-09-02 10:00 ` [PATCH 12/16] drbd: fix conn_reconfig_start without conn_reconfig_done in drbd_adm_attach Philipp Reisner
2011-09-02 10:00 ` [PATCH 13/16] drbd: Allow volumes to become primary only on one side Philipp Reisner
2011-09-02 10:00 ` [PATCH 14/16] drbd: conn_khelper() for user mode callbacks for connections Philipp Reisner
2011-09-02 10:00 ` [PATCH 15/16] drbd: distribute former syncer_conf settings to disk, connection, and resource level Philipp Reisner
2011-09-02 10:00 ` [PATCH 16/16] drbd: Fixed conn_lowest_minor Philipp Reisner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314957648-13242-12-git-send-email-philipp.reisner@linbit.com \
--to=philipp.reisner@linbit.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®