From: nathan <nathan>
Date: Fri, 11 Nov 2005 23:12:50 +0000 (+0000)
Subject: Branch b1_4_mountconf
X-Git-Tag: v1_8_0_110~486^4~136
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=24c9dc1f62be5f0015b7fc829d0072a03cd0411a;p=fs%2Flustre-release.git

Branch b1_4_mountconf
b=8008
module_puts must match module_gets or you can't unload the module.
---

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index d3ebba9..cd0a3fb 100644
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -317,7 +317,7 @@ static int mgc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 if (rc)
                         RETURN(rc);
 
-                RETURN(rc);
+                GOTO(out, rc);
         }
         case OBD_IOC_START: {
                 char *name = data->ioc_inlbuf1;
@@ -331,7 +331,7 @@ static int mgc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                         CERROR("Unable to process log: %s\n", name);
                 pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
 
-                RETURN(rc);
+                GOTO(out, rc);
         }
         default:
                 CERROR("mgc_ioctl(): unrecognised ioctl %#x\n", cmd);