Patchwork [BRANCH:release-3.1,BUG:2695] NFS : Use proper exit point in nfs_init_state.

login
register
Submitter Gaurav
Date 2011-04-21 09:53:22
Message ID <1303379602-14826-1-git-send-email-gaurav@gluster.com>
Download mbox | patch
Permalink /patch/7014/
State Accepted
Headers show

Comments

Gaurav - 2011-04-21 09:53:22
From: Gaurav <gaurav@gluster.com>


Signed-off-by: Gaurav <gaurav@gluster.com>
---
 xlators/nfs/server/src/nfs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Shehjar Tikoo - 2011-04-27 05:01:06
Reviewed OK.

gaurav@gluster.com wrote:
> From: Gaurav <gaurav@gluster.com>
> 
> 
> Signed-off-by: Gaurav <gaurav@gluster.com>
> ---
>  xlators/nfs/server/src/nfs.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
> index 1106773..b06d49e 100644
> --- a/xlators/nfs/server/src/nfs.c
> +++ b/xlators/nfs/server/src/nfs.c
> @@ -504,14 +504,14 @@ nfs_init_state (xlator_t *this)
>                                      &optstr);
>                  if (ret < 0) {
>                          gf_log (GF_NFS, GF_LOG_ERROR, "Failed to parse dict");
> -                        goto free_foppool;
> +                        goto free_rpcsvc;
>                  }
>  
>                  ret = gf_string2uint (optstr, &nfs->memfactor);
>                  if (ret < 0) {
>                          gf_log (GF_NFS, GF_LOG_ERROR, "Failed to parse uint "
>                                  "string");
> -                        goto free_foppool;
> +                        goto free_rpcsvc;
>                  }
>          }
>

Patch

diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index 1106773..b06d49e 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -504,14 +504,14 @@  nfs_init_state (xlator_t *this)
                                     &optstr);
                 if (ret < 0) {
                         gf_log (GF_NFS, GF_LOG_ERROR, "Failed to parse dict");
-                        goto free_foppool;
+                        goto free_rpcsvc;
                 }
 
                 ret = gf_string2uint (optstr, &nfs->memfactor);
                 if (ret < 0) {
                         gf_log (GF_NFS, GF_LOG_ERROR, "Failed to parse uint "
                                 "string");
-                        goto free_foppool;
+                        goto free_rpcsvc;
                 }
         }