X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnrs_crr.c;h=a909606a4b1bdd42cca5fed986a15fc99786af41;hb=ccabce23bd9e366c345c852f565766a799f61238;hp=f03319a99d46cd70bed7ec453a16f4547801816b;hpb=500f334631c6ebec72f5791472f21603da3e0ef9;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/nrs_crr.c b/lustre/ptlrpc/nrs_crr.c
index f03319a..a909606 100644
--- a/lustre/ptlrpc/nrs_crr.c
+++ b/lustre/ptlrpc/nrs_crr.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2017, Intel Corporation.
  *
  * Copyright 2012 Xyratex Technology Limited
  */
@@ -194,7 +194,7 @@ static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
 					     nrs_pol2cptab(policy),
 					     nrs_pol2cptid(policy));
 	if (net->cn_binheap == NULL)
-		GOTO(failed, rc = -ENOMEM);
+		GOTO(out_net, rc = -ENOMEM);
 
 	net->cn_cli_hash = cfs_hash_create("nrs_crrn_nid_hash",
 					   NRS_NID_BITS, NRS_NID_BITS,
@@ -204,7 +204,7 @@ static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
 					   &nrs_crrn_hash_ops,
 					   CFS_HASH_RW_BKTLOCK);
 	if (net->cn_cli_hash == NULL)
-		GOTO(failed, rc = -ENOMEM);
+		GOTO(out_binheap, rc = -ENOMEM);
 
 	/**
 	 * Set default quantum value to max_rpcs_in_flight for non-MDS OSCs;
@@ -223,10 +223,9 @@ static int nrs_crrn_start(struct ptlrpc_nrs_policy *policy, char *arg)
 
 	RETURN(rc);
 
-failed:
-	if (net->cn_binheap != NULL)
-		cfs_binheap_destroy(net->cn_binheap);
-
+out_binheap:
+	cfs_binheap_destroy(net->cn_binheap);
+out_net:
 	OBD_FREE_PTR(net);
 
 	RETURN(rc);