head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.1.0.2
	pkgsrc-2011Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.03.28.14.24.59;	author manu;	state dead;
branches;
next	1.1;

1.1
date	2011.12.16.05.40.46;	author manu;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update glusterfs to 3.2.6, which is a maintenance releases fixing various bugs
@
text
@$NetBSD: patch-cc,v 1.1 2011/12/16 05:40:46 manu Exp $

Fix from upstram: http://review.gluster.com/#change,784

--- xlators/protocol/client/src/client3_1-fops.c.orig	2011-11-14 14:46:02.000000000 +0100
+++ xlators/protocol/client/src/client3_1-fops.c	2011-12-14 15:56:06.000000000 +0100
@@@@ -3613,14 +3613,21 @@@@
         ret = client_submit_vec_request (this, &req, frame, conf->fops, GFS3_OP_WRITE,
                                          client3_1_writev_cbk,
                                          args->vector, args->count,
                                          args->iobref, xdr_from_writev_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;
 }
 
@


1.1
log
@- SSL bug fixes
- Use secondary groups
@
text
@d1 1
a1 1
$NetBSD$
@