From patchwork Wed Sep 9 09:17:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 7145251 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 67BDF9F314 for ; Wed, 9 Sep 2015 09:18:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B0B220959 for ; Wed, 9 Sep 2015 09:18:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93AA620906 for ; Wed, 9 Sep 2015 09:18:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752076AbbIIJSg (ORCPT ); Wed, 9 Sep 2015 05:18:36 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:35627 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbbIIJSf (ORCPT ); Wed, 9 Sep 2015 05:18:35 -0400 Received: by pacfv12 with SMTP id fv12so4921194pac.2 for ; Wed, 09 Sep 2015 02:18:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cfXz/TJPYmuMTP9gPD0tOvagrgI1QP8vRdTjsGt2BoI=; b=hVg5w6DOu+gNCO/F7TrGF+PcK4C1BPaJ++sWl1k5Kpn1tS+RYcVokZLTaWVQlmTQq8 vpM7DeqVerDNMNK/m6Le23z9dRlkvfsEWmOX4nDwN8f/+Lo+hk5ibxtdyHqmObMx+DFp ojsLzE4p0RTPQ6PCCvz7VV372fc0Zhjewje1/MbpqiQ8v+9gmMLLa40O4kNLSXU6ouS3 THbf0vZkMdxhL1cW8MzobWCl2SAtMkphxYk9iHAdQNn2DGCV2/yLruoHx7TWOfMAdL34 WzlgXXwm7zsnW/qgVQu0jwzedCHhfV34f8WY+AV+XbRHmozZ3OsLb2BEu6m6gr0ZUwBs 0d+g== X-Gm-Message-State: ALoCoQlTpFmxEQdlj7budYgYVKn8XWXZGoxglJMk+Yemv68+Xzt9NIk566Nk/ROcziMJGSBvwCes X-Received: by 10.66.140.70 with SMTP id re6mr59881751pab.31.1441790315207; Wed, 09 Sep 2015 02:18:35 -0700 (PDT) Received: from lear.localdomain (ec2-54-65-164-9.ap-northeast-1.compute.amazonaws.com. [54.65.164.9]) by smtp.gmail.com with ESMTPSA id g4sm6274264pdi.32.2015.09.09.02.18.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Sep 2015 02:18:34 -0700 (PDT) From: Peng Tao To: linux-nfs@vger.kernel.org Cc: Trond Myklebust , Peng Tao Subject: [PATCH] nfs: remove roc_rpcwaitq Date: Wed, 9 Sep 2015 17:17:40 +0800 Message-Id: <1441790260-35583-1-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 There are no users of it after we remove pnfs_roc_drain. Signed-off-by: Peng Tao --- fs/nfs/client.c | 10 ---------- fs/nfs/pnfs.c | 4 ---- include/linux/nfs_fs_sb.h | 1 - 3 files changed, 15 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 57c5a02..46ce7bf 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -215,11 +215,6 @@ static void nfs_cb_idr_remove_locked(struct nfs_client *clp) idr_remove(&nn->cb_ident_idr, clp->cl_cb_ident); } -static void pnfs_init_server(struct nfs_server *server) -{ - rpc_init_wait_queue(&server->roc_rpcwaitq, "pNFS ROC"); -} - #else void nfs_cleanup_cb_ident_idr(struct net *net) { @@ -229,10 +224,6 @@ static void nfs_cb_idr_remove_locked(struct nfs_client *clp) { } -static void pnfs_init_server(struct nfs_server *server) -{ -} - #endif /* CONFIG_NFS_V4 */ /* @@ -900,7 +891,6 @@ struct nfs_server *nfs_alloc_server(void) ida_init(&server->openowner_id); ida_init(&server->lockowner_id); - pnfs_init_server(server); return server; } diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index ba12464..dcc3571 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -334,15 +334,12 @@ static void pnfs_layout_remove_lseg(struct pnfs_layout_hdr *lo, struct pnfs_layout_segment *lseg) { - struct inode *inode = lo->plh_inode; - WARN_ON(test_bit(NFS_LSEG_VALID, &lseg->pls_flags)); list_del_init(&lseg->pls_list); /* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */ atomic_dec(&lo->plh_refcount); if (list_empty(&lo->plh_segs)) clear_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags); - rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq); } /* Return true if layoutreturn is needed */ @@ -936,7 +933,6 @@ void pnfs_clear_layoutreturn_waitbit(struct pnfs_layout_hdr *lo) clear_bit_unlock(NFS_LAYOUT_RETURN, &lo->plh_flags); smp_mb__after_atomic(); wake_up_bit(&lo->plh_flags, NFS_LAYOUT_RETURN); - rpc_wake_up(&NFS_SERVER(lo->plh_inode)->roc_rpcwaitq); } static int diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 570a7df..fad6b61 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -190,7 +190,6 @@ struct nfs_server { handle volatility type for this filesystem */ struct pnfs_layoutdriver_type *pnfs_curr_ld; /* Active layout driver */ - struct rpc_wait_queue roc_rpcwaitq; void *pnfs_ld_data; /* per mount point data */ /* the following fields are protected by nfs_client->cl_lock */