Patchwork [BUG:2124] NFS : Fail Nfs init if volume-id not found.

login
register
Submitter Gaurav
Date 2011-02-09 06:09:55
Message ID <1297231795-10828-1-git-send-email-gaurav@gluster.com>
Download mbox | patch
Permalink /patch/6154/
State Accepted
Delegated to: Anand Avati
Headers show

Comments

Gaurav - 2011-02-09 06:09:55
From: Gaurav <gaurav@gluster.com>


Signed-off-by: Gaurav <gaurav@gluster.com>
---
 xlators/nfs/server/src/nfs.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
Shehjar Tikoo - 2011-02-09 09:40:15
Reviewed OK. Gaurav, please ensure that the delegate field for your patches 
  on patches.gluster is set to Avati. I've done it this time for you.

gaurav@gluster.com wrote:
> From: Gaurav <gaurav@gluster.com>
> 
> 
> Signed-off-by: Gaurav <gaurav@gluster.com>
> ---
>  xlators/nfs/server/src/nfs.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
> index 1ef7cdc..0760b40 100644
> --- a/xlators/nfs/server/src/nfs.c
> +++ b/xlators/nfs/server/src/nfs.c
> @@ -113,13 +113,12 @@ nfs_init_versions (struct nfs_state *nfs, xlator_t *this)
>                  }
>  
>                  prog = version->init (this);
> -                prog->actorxl = this;
> -                version->program = prog;
>                  if (!prog) {
>                          ret = -1;
>                          goto err;
>                  }
> -
> +                prog->actorxl = this;
> +                version->program = prog;
>                  if (nfs->override_portnum)
>                          prog->progport = nfs->override_portnum;
>                  gf_log (GF_NFS, GF_LOG_DEBUG, "Starting program: %s",
Vikas Gorur - 2011-02-09 17:58:29
On Feb 9, 2011, at 1:40 AM, Shehjar Tikoo wrote:

> Reviewed OK. Gaurav, please ensure that the delegate field for your patches  on patches.gluster is set to Avati. I've done it this time for you.

If you add avati@gluster.com as CC to your patch e-mails, the delegate is automatically set.

------------------------------
Vikas Gorur
Engineer - Gluster, Inc.
------------------------------

Patch

diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index 1ef7cdc..0760b40 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -113,13 +113,12 @@  nfs_init_versions (struct nfs_state *nfs, xlator_t *this)
                 }
 
                 prog = version->init (this);
-                prog->actorxl = this;
-                version->program = prog;
                 if (!prog) {
                         ret = -1;
                         goto err;
                 }
-
+                prog->actorxl = this;
+                version->program = prog;
                 if (nfs->override_portnum)
                         prog->progport = nfs->override_portnum;
                 gf_log (GF_NFS, GF_LOG_DEBUG, "Starting program: %s",