|
|
50dc83 |
From d91eadbbb3e2d02e7297214da394b0e232544386 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
Date: Tue, 2 May 2017 14:06:00 +0530
|
|
|
50dc83 |
Subject: [PATCH 066/124] glusterd/ganesha : add proper NULL check in
|
|
|
e7a346 |
manage_export_config
|
|
|
e7a346 |
|
|
|
50dc83 |
Label: DOWNSTREAM ONLY
|
|
|
50dc83 |
|
|
|
e7a346 |
Change-Id: I872b2b6b027f04e61f60ad85588f50e1ef2f988c
|
|
|
e7a346 |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://review.gluster.org/17150
|
|
|
e7a346 |
Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
e7a346 |
Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
e7a346 |
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
e7a346 |
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
e7a346 |
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
50dc83 |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
50dc83 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/167151
|
|
|
50dc83 |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
50dc83 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
50dc83 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 2 +-
|
|
|
e7a346 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
50dc83 |
index d9fdfc6..fe0bffc 100644
|
|
|
e7a346 |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
e7a346 |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
50dc83 |
@@ -435,7 +435,7 @@ manage_export_config(char *volname, char *value, char **op_errstr)
|
|
|
50dc83 |
CONFDIR, value, volname, NULL);
|
|
|
50dc83 |
ret = runner_run(&runner);
|
|
|
e7a346 |
|
|
|
50dc83 |
- if (ret && !(*op_errstr))
|
|
|
50dc83 |
+ if (ret && op_errstr)
|
|
|
50dc83 |
gf_asprintf(op_errstr,
|
|
|
50dc83 |
"Failed to create"
|
|
|
50dc83 |
" NFS-Ganesha export config file.");
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|