From patchwork Fri Sep 21 01:35:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 1488731 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 116B4DF2D2 for ; Fri, 21 Sep 2012 01:36:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754700Ab2IUBgi (ORCPT ); Thu, 20 Sep 2012 21:36:38 -0400 Received: from mx2.netapp.com ([216.240.18.37]:26053 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754723Ab2IUBgK (ORCPT ); Thu, 20 Sep 2012 21:36:10 -0400 X-IronPort-AV: E=Sophos;i="4.80,458,1344236400"; d="scan'208";a="692166538" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 20 Sep 2012 18:36:10 -0700 Received: from lade.trondhjem.org.com (lade.trondhjem.org [10.63.233.1] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id q8L1a0cB022580; Thu, 20 Sep 2012 18:36:10 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 13/14] NFSv4.1: Get rid of pNFS spin lock debugging asserts... Date: Thu, 20 Sep 2012 21:35:56 -0400 Message-Id: <1348191357-44503-13-git-send-email-Trond.Myklebust@netapp.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348191357-44503-12-git-send-email-Trond.Myklebust@netapp.com> References: <1348191357-44503-1-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-2-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-3-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-4-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-5-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-6-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-7-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-8-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-9-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-10-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-11-git-send-email-Trond.Myklebust@netapp.com> <1348191357-44503-12-git-send-email-Trond.Myklebust@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org These are all in static declared functions that are called only once. Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 9c5320c..bbdce87 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -829,7 +829,6 @@ pnfs_layout_insert_lseg(struct pnfs_layout_hdr *lo, dprintk("%s:Begin\n", __func__); - assert_spin_locked(&lo->plh_inode->i_lock); list_for_each_entry(lp, &lo->plh_segs, pls_list) { if (cmp_layout(&lseg->pls_range, &lp->pls_range) > 0) continue; @@ -883,7 +882,6 @@ pnfs_find_alloc_layout(struct inode *ino, dprintk("%s Begin ino=%p layout=%p\n", __func__, ino, nfsi->layout); - assert_spin_locked(&ino->i_lock); if (nfsi->layout) { if (test_bit(NFS_LAYOUT_DESTROYED, &nfsi->layout->plh_flags)) return NULL; @@ -940,7 +938,6 @@ pnfs_find_lseg(struct pnfs_layout_hdr *lo, dprintk("%s:Begin\n", __func__); - assert_spin_locked(&lo->plh_inode->i_lock); list_for_each_entry(lseg, &lo->plh_segs, pls_list) { if (test_bit(NFS_LSEG_VALID, &lseg->pls_flags) && is_matching_lseg(&lseg->pls_range, range)) {