diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index e3f8673a6516f8ed05675ecff7f9eccc609311d8..d148fc3831a0f728798d5dae143f5e50706941c3 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -821,12 +821,15 @@ void target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
         }
 
         if (!OBD_FAIL_CHECK(fail_id | OBD_FAIL_ONCE)) {
-                if (rc) {
-                        DEBUG_REQ(D_ERROR, req, "processing error (%d)", rc);
-                        netrc = ptlrpc_error(req);
-                } else {
+                if (rc == 0) {
                         DEBUG_REQ(D_NET, req, "sending reply");
                         netrc = ptlrpc_reply(req);
+                } else if (rc == -ENOTCONN) {
+                        DEBUG_REQ(D_HA, req, "processing error (%d)", rc);
+                        netrc = ptlrpc_error(req);
+                } else {
+                        DEBUG_REQ(D_ERROR, req, "processing error (%d)", rc);
+                        netrc = ptlrpc_error(req);
                 }
         } else {
                 obd_fail_loc |= OBD_FAIL_ONCE | OBD_FAILED;
diff --git a/lustre/llite/commit_callback.c b/lustre/llite/commit_callback.c
index ee49bb859a5180a94700df30023d969a7a2a9a53..99fc2854c704391b10d967e067e62de5cbb24227 100644
--- a/lustre/llite/commit_callback.c
+++ b/lustre/llite/commit_callback.c
@@ -83,7 +83,6 @@ static int ll_commitcbd_main(void *arg)
                 spin_lock(&sbi->ll_commitcbd_lock);
                 if (sbi->ll_commitcbd_flags & LL_COMMITCBD_STOPPING) {
                         spin_unlock(&sbi->ll_commitcbd_lock);
-                        CERROR("lustre_commitd quitting\n");
                         EXIT;
                         break;
                 }
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index cbcfdaef7b739e49b069123d07dc43d8ce422f29..b90bdc18c6d59587bc67ca4a2e1be4ff04a930cf 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -1566,9 +1566,7 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
         ENTRY;
 
 
-#ifdef CONFIG_DEV_RDONLY
         dev_clear_rdonly(2);
-#endif
         if (!data->ioc_inlbuf1 || !data->ioc_inlbuf2)
                 RETURN(rc = -EINVAL);
 
@@ -1696,9 +1694,7 @@ static int mds_cleanup(struct obd_device *obd, int flags)
         if (obd->obd_recovering)
                 target_cancel_recovery_timer(obd);
         lock_kernel();
-#ifdef CONFIG_DEV_RDONLY
         dev_clear_rdonly(2);
-#endif
         fsfilt_put_ops(obd->obd_fsops);
 
         RETURN(0);
@@ -1854,9 +1850,9 @@ static int ldlm_intent_policy(struct ldlm_namespace *ns,
                  * have one reader _or_ writer ref (which will be zeroed below
                  * before returning the lock to a client.
                  */
-                if (new_lock->l_export == req->rq_export) {
+                if (new_lock->l_export == req->rq_export)
                         LASSERT(new_lock->l_readers + new_lock->l_writers == 0);
-                } else {
+                else {
                         LASSERT(new_lock->l_export == NULL);
                         LASSERT(new_lock->l_readers + new_lock->l_writers == 1);
                 }
diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 167898aff5c183d176bc84405556ff44454d489c..25580bfd6b702a905498666942fc90f8fe01ce89 100644
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -316,10 +316,10 @@ static int bulk_get_sink_callback(ptl_event_t *ev)
         unsigned long            flags;
         ENTRY;
 
-        CDEBUG(D_NET, "got %s event %d\n",
+        CDEBUG(D_NET, "got %s event %d desc %p\n",
                (ev->type == PTL_EVENT_SENT) ? "SENT" :
                (ev->type == PTL_EVENT_REPLY)  ? "REPLY"  : "UNEXPECTED",
-               ev->type);
+               ev->type, desc);
 
         LASSERT(ev->type == PTL_EVENT_SENT || ev->type == PTL_EVENT_REPLY);