From: Emoly Liu Date: Thu, 9 Jul 2015 08:13:39 +0000 (+0800) Subject: LU-6822 nrs: remove obsolete assertion in nrs_orr_start() X-Git-Tag: 2.7.57~14 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=06c83e0109b2e934ac8cbcdcb2a22f184fe546f5;p=fs%2Flustre-release.git LU-6822 nrs: remove obsolete assertion in nrs_orr_start() kmem_cache_destroy() doesn't return any value, so we should remove this obsolete assertion, otherwise LBUG will happen when orr policy is enabled. Signed-off-by: Emoly Liu Change-Id: I240e7bd660a6960b1e29da3575388a966ce8dca9 Reviewed-on: http://review.whamcloud.com/15540 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Hongchao Zhang Reviewed-by: Oleg Drokin --- diff --git a/lustre/ptlrpc/nrs_orr.c b/lustre/ptlrpc/nrs_orr.c index 3a949a4..97be950 100644 --- a/lustre/ptlrpc/nrs_orr.c +++ b/lustre/ptlrpc/nrs_orr.c @@ -693,10 +693,8 @@ static int nrs_orr_start(struct ptlrpc_nrs_policy *policy, char *arg) RETURN(rc); failed: - if (orrd->od_cache) { + if (orrd->od_cache) kmem_cache_destroy(orrd->od_cache); - LASSERTF(rc == 0, "Could not destroy od_cache slab\n"); - } if (orrd->od_binheap != NULL) cfs_binheap_destroy(orrd->od_binheap);