From: Oleg Drokin Date: Mon, 20 Jun 2016 20:55:29 +0000 (-0400) Subject: staging/lustre/osc: Fix reverted condition in osc_lock_weight X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fbe0456482aa5c482342735f342483a75ada8b96;p=openwrt%2Fstaging%2Fblogic.git staging/lustre/osc: Fix reverted condition in osc_lock_weight When imprting clio simplification patch, the check for pbject got reversed by mistake when converting from if (obj == NULL) it somehow became (if (obj) which is obviously wrong, and so when it does hit, a crash was happening as result. Fix the condition and all if fine now. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c index d85677522fc9..5455d9de045b 100644 --- a/drivers/staging/lustre/lustre/osc/osc_lock.c +++ b/drivers/staging/lustre/lustre/osc/osc_lock.c @@ -699,7 +699,7 @@ unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock) LASSERT(dlmlock->l_resource->lr_type == LDLM_EXTENT); obj = dlmlock->l_ast_data; - if (obj) { + if (!obj) { weight = 1; goto out; }