From patchwork Tue Dec 10 11:11:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Xiang X-Patchwork-Id: 3317511 Return-Path: X-Original-To: patchwork-linux-nfs@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 A57C0C0D4A for ; Tue, 10 Dec 2013 11:14:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7387B2026F for ; Tue, 10 Dec 2013 11:14:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76E722017B for ; Tue, 10 Dec 2013 11:14:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751406Ab3LJLOm (ORCPT ); Tue, 10 Dec 2013 06:14:42 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:63829 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750887Ab3LJLOl (ORCPT ); Tue, 10 Dec 2013 06:14:41 -0500 Received: from 172.24.2.119 (EHLO szxeml205-edg.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id AHM04283; Tue, 10 Dec 2013 19:11:18 +0800 (CST) Received: from SZXEML450-HUB.china.huawei.com (10.82.67.193) by szxeml205-edg.china.huawei.com (172.24.2.58) with Microsoft SMTP Server (TLS) id 14.3.158.1; Tue, 10 Dec 2013 19:11:12 +0800 Received: from [127.0.0.1] (10.135.72.188) by szxeml450-hub.china.huawei.com (10.82.67.193) with Microsoft SMTP Server id 14.3.158.1; Tue, 10 Dec 2013 19:11:12 +0800 Message-ID: <52A6F6C9.90704@huawei.com> Date: Tue, 10 Dec 2013 19:11:05 +0800 From: Rui Xiang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Trond Myklebust , Linux NFS Mailing List Subject: [PATCH] NFSv4.1: remove unused cred parameter from nfs41_walk_client_list X-Originating-IP: [10.135.72.188] X-CFilter-Loop: Reflected Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Clean Up. Signed-off-by: Rui Xiang --- fs/nfs/internal.h | 3 +-- fs/nfs/nfs4client.c | 4 +--- fs/nfs/nfs4state.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 8b5cc04..cdcfc8f 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -482,8 +482,7 @@ extern int nfs40_walk_client_list(struct nfs_client *clp, struct nfs_client **result, struct rpc_cred *cred); extern int nfs41_walk_client_list(struct nfs_client *clp, - struct nfs_client **result, - struct rpc_cred *cred); + struct nfs_client **result); /* * Determine the device name as a string diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index b4a160a..4db9b38 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -596,7 +596,6 @@ out_major_mismatch: * * @new: nfs_client with client ID to test * @result: OUT: found nfs_client, or new - * @cred: credential to use for trunking test * * Returns zero, a negative errno, or a negative NFS4ERR status. * If zero is returned, an nfs_client pointer is planted in "result." @@ -605,8 +604,7 @@ out_major_mismatch: * the last nfs_client on the list. */ int nfs41_walk_client_list(struct nfs_client *new, - struct nfs_client **result, - struct rpc_cred *cred) + struct nfs_client **result) { struct nfs_net *nn = net_generic(new->cl_net, nfs_net_id); struct nfs_client *pos, *prev = NULL; diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 059c01b..268a17a 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -348,7 +348,7 @@ int nfs41_discover_server_trunking(struct nfs_client *clp, return status; set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state); - return nfs41_walk_client_list(clp, result, cred); + return nfs41_walk_client_list(clp, result); } #endif /* CONFIG_NFS_V4_1 */