summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlators/protocol/client/src/client3_1-fops.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index 98d19c701..9b0fd63cc 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -3623,12 +3623,19 @@ client3_1_writev (call_frame_t *frame, xlator_t *this, void *data)
client3_1_writev_cbk, args->vector,
args->count, args->iobref,
(xdrproc_t)xdr_gfs3_write_req);
- if (ret)
- goto unwind;
+ if (ret) {
+ /*
+ * If the lower layers fail to submit a request, they'll also
+ * do the unwind for us (see rpc_clnt_submit), so don't unwind
+ * here in such cases.
+ */
+ gf_log (this->name, GF_LOG_WARNING,
+ "failed to send the fop: %s", strerror (op_errno));
+ }
return 0;
+
unwind:
- gf_log (this->name, GF_LOG_WARNING, "failed to send the fop: %s", strerror (op_errno));
STACK_UNWIND_STRICT (writev, frame, -1, op_errno, NULL, NULL);
return 0;
}