Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391AbbKKKWQ (ORCPT ); Wed, 11 Nov 2015 05:22:16 -0500 Received: from mail-pa0-f68.google.com ([209.85.220.68]:32935 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160AbbKKKWP (ORCPT ); Wed, 11 Nov 2015 05:22:15 -0500 From: Shivani Bhardwaj To: gregkh@linuxfoundation.org Cc: andreas.dilger@intel.com, oleg.drokin@intel.com, lustre-devel@lists.lustre.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH] staging: lustre: cl_lock: Remove cl_lock_lockdep_init wrapper Date: Wed, 11 Nov 2015 15:51:46 +0530 Message-Id: <1447237306-46901-1-git-send-email-shivanib134@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1525 Lines: 41 Remove the wrapper function cl_lock_lockdep_init() and replace its only call with the function it wrapped. Signed-off-by: Shivani Bhardwaj --- drivers/staging/lustre/lustre/obdclass/cl_lock.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lustre/obdclass/cl_lock.c b/drivers/staging/lustre/lustre/obdclass/cl_lock.c index 1836dc0..813d0ab 100644 --- a/drivers/staging/lustre/lustre/obdclass/cl_lock.c +++ b/drivers/staging/lustre/lustre/obdclass/cl_lock.c @@ -147,11 +147,6 @@ static void cl_lock_trace0(int level, const struct lu_env *env, #ifdef CONFIG_LOCKDEP static struct lock_class_key cl_lock_key; -static void cl_lock_lockdep_init(struct cl_lock *lock) -{ - lockdep_set_class_and_name(lock, &cl_lock_key, "EXT"); -} - static void cl_lock_lockdep_acquire(const struct lu_env *env, struct cl_lock *lock, __u32 enqflags) { @@ -381,7 +376,7 @@ static struct cl_lock *cl_lock_alloc(const struct lu_env *env, CS_LOCKSTATE_INC(obj, CLS_NEW); CS_LOCK_INC(obj, total); CS_LOCK_INC(obj, create); - cl_lock_lockdep_init(lock); + lockdep_set_class_and_name(lock, &cl_lock_key, "EXT"); list_for_each_entry(obj, &head->loh_layers, co_lu.lo_linkage) { int err; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/