From patchwork Mon Jul 13 09:32:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6776961 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7BA0BC05AC for ; Mon, 13 Jul 2015 09:33:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2A84204AE for ; Mon, 13 Jul 2015 09:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB5B520173 for ; Mon, 13 Jul 2015 09:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751023AbbGMJdE (ORCPT ); Mon, 13 Jul 2015 05:33:04 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:36541 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750919AbbGMJdD (ORCPT ); Mon, 13 Jul 2015 05:33:03 -0400 Received: by pdjr16 with SMTP id r16so60035546pdj.3 for ; Mon, 13 Jul 2015 02:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=FgAugqZOQGQVvIidV301QGr6YDEqez6B3r9JbitwFgU=; b=PbbVEEp5nS0brN63n3ube4ve3TJLxaS3YMY2gYmd9gte5oSzXLuEYU4TmyuHb9HUGD F4CWxpfllji0qypv1D6eNd1gDm1S9DIRUm+Sq1m2gb4GzsK6TjMSCHg85SK2cnQmYaBN jHG+JYlqPlyzgoyaAjLmzsUAfL3y7EJO8WZ59WZ0ME6X16ybHOB3qciFiKYleCGmZCWI EP56iteiV1+NvY0Wvm3+FJReUncgShaWS04UoKtxvEVlx+bJGXCbIK8NS4KQ4jjuCSTE F2Jwug3pipTEyKIq7FQ/lP7a4pUKK/K/WHxOhLeKR9+ghrGc0DXrOv9qnxaJjWKogcod 0KQg== X-Received: by 10.66.160.1 with SMTP id xg1mr67408541pab.27.1436779982878; Mon, 13 Jul 2015 02:33:02 -0700 (PDT) Received: from [192.168.99.19] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id to5sm7528015pac.33.2015.07.13.02.33.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 02:33:02 -0700 (PDT) Message-ID: <55A385CB.2040608@gmail.com> Date: Mon, 13 Jul 2015 17:32:59 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "J. Bruce Fields" , "linux-nfs@vger.kernel.org" CC: kinglongmee@gmail.com Subject: [PATCH 09/14] nfsd: Remove nfs4_set_claim_prev() References: <55A384B1.8030207@gmail.com> In-Reply-To: <55A384B1.8030207@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4state.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c94d1ef..f3c38e3 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3887,12 +3887,6 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp, struct svc_fh *c return status; } -static void -nfs4_set_claim_prev(struct nfsd4_open *open, bool has_session) -{ - open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED; -} - /* Should we give out recallable state?: */ static bool nfsd4_cb_channel_good(struct nfs4_client *clp) { @@ -4212,7 +4206,7 @@ out: if (fp) put_nfs4_file(fp); if (status == 0 && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS) - nfs4_set_claim_prev(open, nfsd4_has_session(&resp->cstate)); + open->op_openowner->oo_flags |= NFS4_OO_CONFIRMED; /* * To finish the open response, we just need to set the rflags. */