X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_resource.c;h=5f6a64531e6eeeef5d8e7253d6ac98ff82cd0342;hp=ae70626921aee96b687297756f27807986dec2c2;hb=b29c9945aba485cf8e895cbafdb894f8da2375b7;hpb=593b6ab6d21976d37004621b86f37715df697e9e

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index ae70626..5f6a645 100644
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -1077,6 +1077,7 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
 	cfs_hash_bd_t		bd;
 	__u64			version;
 	int			ns_refcount = 0;
+	int			rc;
 
         LASSERT(ns != NULL);
         LASSERT(parent == NULL);
@@ -1128,8 +1129,9 @@ lvbo_init:
 		}
 
 		if (unlikely(res->lr_lvb_len < 0)) {
+			rc = res->lr_lvb_len;
 			ldlm_resource_putref(res);
-			res = ERR_PTR(res->lr_lvb_len);
+			res = ERR_PTR(rc);
 		}
 		return res;
 	}
@@ -1140,8 +1142,6 @@ lvbo_init:
 
         cfs_hash_bd_unlock(ns->ns_rs_hash, &bd, 1);
         if (ns->ns_lvbo && ns->ns_lvbo->lvbo_init) {
-                int rc;
-
                 OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CREATE_RESOURCE, 2);
                 rc = ns->ns_lvbo->lvbo_init(res);
 		if (rc < 0) {