From patchwork Wed Jul 3 20:20:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 2820531 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8292ABF4A1 for ; Wed, 3 Jul 2013 20:27:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8F1142036A for ; Wed, 3 Jul 2013 20:27:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAFCC20367 for ; Wed, 3 Jul 2013 20:27:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965071Ab3GCUUt (ORCPT ); Wed, 3 Jul 2013 16:20:49 -0400 Received: from g6t0185.atlanta.hp.com ([15.193.32.62]:24339 "EHLO g6t0185.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964880Ab3GCUUr (ORCPT ); Wed, 3 Jul 2013 16:20:47 -0400 Received: from g5t0029.atlanta.hp.com (g5t0029.atlanta.hp.com [16.228.8.141]) by g6t0185.atlanta.hp.com (Postfix) with ESMTP id 1B2602419B; Wed, 3 Jul 2013 20:20:46 +0000 (UTC) Received: from RHEL64.localdomain (unknown [16.99.82.253]) by g5t0029.atlanta.hp.com (Postfix) with ESMTP id 853042C101; Wed, 3 Jul 2013 20:20:44 +0000 (UTC) From: Waiman Long Cc: Mike Marciniszyn , Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, Waiman Long , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Steven Rostedt , Linus Torvalds , Benjamin Herrenschmidt , Andi Kleen , "Chandramouleeswaran, Aswin" , "Norton, Scott J" Subject: [PATCH v3 05/25] infiniband: Change how dentry's d_lock field is accessed Date: Wed, 3 Jul 2013 16:20:31 -0400 Message-Id: <1372882831-22671-1-git-send-email-Waiman.Long@hp.com> X-Mailer: git-send-email 1.7.1 To: Alexander Viro , Jeff Layton , Miklos Szeredi , Ingo Molnar , Thomas Gleixner Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because of the changes made in dcache.h header file, files that use the d_lock field of the dentry structure need to be changed accordingly. All the d_lock's spin_lock() and spin_unlock() calls are replaced by the corresponding d_lock() and d_unlock() calls. There is no change in logic and everything should just work. Signed-off-by: Waiman Long --- drivers/infiniband/hw/ipath/ipath_fs.c | 6 +++--- drivers/infiniband/hw/qib/qib_fs.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index e0c404b..1efee26 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c @@ -277,14 +277,14 @@ static int remove_file(struct dentry *parent, char *name) goto bail; } - spin_lock(&tmp->d_lock); + d_lock(tmp); if (!(d_unhashed(tmp) && tmp->d_inode)) { dget_dlock(tmp); __d_drop(tmp); - spin_unlock(&tmp->d_lock); + d_unlock(tmp); simple_unlink(parent->d_inode, tmp); } else - spin_unlock(&tmp->d_lock); + d_unlock(tmp); ret = 0; bail: diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c index f247fc6..63713ee 100644 --- a/drivers/infiniband/hw/qib/qib_fs.c +++ b/drivers/infiniband/hw/qib/qib_fs.c @@ -454,14 +454,14 @@ static int remove_file(struct dentry *parent, char *name) goto bail; } - spin_lock(&tmp->d_lock); + d_lock(tmp); if (!(d_unhashed(tmp) && tmp->d_inode)) { dget_dlock(tmp); __d_drop(tmp); - spin_unlock(&tmp->d_lock); + d_unlock(tmp); simple_unlink(parent->d_inode, tmp); } else { - spin_unlock(&tmp->d_lock); + d_unlock(tmp); } ret = 0;