X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fgenops.c;h=9d577f9e799cb9f1a02a5a2bc31246aa6da20f12;hb=refs%2Fchanges%2F80%2F8080%2F5;hp=b430c24cc280d92c9d0701a7fdb7011879e0484c;hpb=96daa1b1ec0b4c9c61d30ff18a32f015a14fd528;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index b430c24..9d577f9 100644
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -689,6 +689,7 @@ void obd_cleanup_caches(void)
 
 int obd_init_caches(void)
 {
+	int rc;
 	ENTRY;
 
 	LASSERT(obd_device_cachep == NULL);
@@ -696,32 +697,31 @@ int obd_init_caches(void)
 					      sizeof(struct obd_device),
 					      0, 0, NULL);
 	if (!obd_device_cachep)
-		GOTO(out, -ENOMEM);
+		GOTO(out, rc = -ENOMEM);
 
 	LASSERT(obdo_cachep == NULL);
 	obdo_cachep = kmem_cache_create("ll_obdo_cache", sizeof(struct obdo),
 					0, 0, NULL);
 	if (!obdo_cachep)
-		GOTO(out, -ENOMEM);
+		GOTO(out, rc = -ENOMEM);
 
 	LASSERT(import_cachep == NULL);
 	import_cachep = kmem_cache_create("ll_import_cache",
 					  sizeof(struct obd_import),
 					  0, 0, NULL);
 	if (!import_cachep)
-		GOTO(out, -ENOMEM);
+		GOTO(out, rc = -ENOMEM);
 
 	LASSERT(capa_cachep == NULL);
 	capa_cachep = kmem_cache_create("capa_cache", sizeof(struct obd_capa),
 					0, 0, NULL);
 	if (!capa_cachep)
-		GOTO(out, -ENOMEM);
+		GOTO(out, rc = -ENOMEM);
 
 	RETURN(0);
 out:
 	obd_cleanup_caches();
-	RETURN(-ENOMEM);
-
+	RETURN(rc);
 }
 
 /* map connection to client */