LU-4069 build: cleanup from GOTO(label, -ERRNO)

[fs/lustre-release.git] / lustre / obdclass / genops.c

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index b430c24..9d577f9 100644 (file)
--- 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 */