Date: Thu, 27 Oct 2011 18:49:16 +0000 (UTC) From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226852 - head/sbin/hastd Message-ID: <201110271849.p9RInGwA020084@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pjd Date: Thu Oct 27 18:49:16 2011 New Revision: 226852 URL: http://svn.freebsd.org/changeset/base/226852 Log: Monor cleanups. MFC after: 3 days Modified: head/sbin/hastd/primary.c Modified: head/sbin/hastd/primary.c ============================================================================== --- head/sbin/hastd/primary.c Thu Oct 27 18:45:01 2011 (r226851) +++ head/sbin/hastd/primary.c Thu Oct 27 18:49:16 2011 (r226852) @@ -1453,9 +1453,6 @@ remote_send_thread(void *arg) /* Move failed request immediately to the done queue. */ goto done_queue; } - pjdlog_debug(2, - "remote_send: (%p) Moving request to the recv queue.", - hio); /* * Protect connection from disappearing. */ @@ -1470,6 +1467,9 @@ remote_send_thread(void *arg) * in different order we can get reply before we move request * to recv queue. */ + pjdlog_debug(2, + "remote_send: (%p) Moving request to the recv queue.", + hio); mtx_lock(&hio_recv_list_lock[ncomp]); wakeup = TAILQ_EMPTY(&hio_recv_list[ncomp]); TAILQ_INSERT_TAIL(&hio_recv_list[ncomp], hio, hio_next[ncomp]); @@ -1489,7 +1489,8 @@ remote_send_thread(void *arg) * it immediately to the done queue. */ mtx_lock(&hio_recv_list_lock[ncomp]); - TAILQ_REMOVE(&hio_recv_list[ncomp], hio, hio_next[ncomp]); + TAILQ_REMOVE(&hio_recv_list[ncomp], hio, + hio_next[ncomp]); mtx_unlock(&hio_recv_list_lock[ncomp]); goto done_queue; } @@ -1599,16 +1600,16 @@ remote_recv_thread(void *arg) nv_free(nv); continue; } + ggio = &hio->hio_ggio; error = nv_get_int16(nv, "error"); if (error != 0) { /* Request failed on remote side. */ hio->hio_errors[ncomp] = error; - reqlog(LOG_WARNING, 0, &hio->hio_ggio, + reqlog(LOG_WARNING, 0, ggio, "Remote request failed (%s): ", strerror(error)); nv_free(nv); goto done_queue; } - ggio = &hio->hio_ggio; switch (ggio->gctl_cmd) { case BIO_READ: rw_rlock(&hio_remote_lock[ncomp]);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110271849.p9RInGwA020084>