From patchwork Wed Aug 9 01:40:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9889407 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D53E6601EB for ; Wed, 9 Aug 2017 01:40:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4BAB2897C for ; Wed, 9 Aug 2017 01:40:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B993A289FE; Wed, 9 Aug 2017 01:40:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B1BF28A18 for ; Wed, 9 Aug 2017 01:40:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbdHIBkn (ORCPT ); Tue, 8 Aug 2017 21:40:43 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:36010 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbdHIBkm (ORCPT ); Tue, 8 Aug 2017 21:40:42 -0400 Received: by mail-io0-f194.google.com with SMTP id j32so3683809iod.3 for ; Tue, 08 Aug 2017 18:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=6z43kfUQGbd1bECA+hl1n+vK7UOqirysh3MYhCnYV9E=; b=aeemAKrV1V8tB38fgeBgLYWoE9W1hkQfCaHXb1nHxWX8xmaTGh78/POSEhfx/5qMkP 6CVV2HTM9X1RUP4QuYwCpc5BOyCY+N6N1aDrlSpASemTprOBIH4OBuFcbwyZ3nl+ZoML dCo5FRo4L+5Ve+bZw7KfOAeBTEtEljRmIwEEzCyOb533PQ4z4JAuRj7n7cmkV53Yb15p C7gGDjYvBBqm9iOopgnFNWRhBW9+sM0l5WUDrtxSIXGuYK1bgBqUqv1FJKTL0XoFCHHX 8Hz2xyxUSOTk2G0BgCTdjMMAo5bFKVrn2dTfSBS7UuzGd8IKqzA70kLh4bQIsrL75rdR B02Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=6z43kfUQGbd1bECA+hl1n+vK7UOqirysh3MYhCnYV9E=; b=DQXht038LStleSpLJZIjgn+ZDsIUw9VeAvdJG9vNiqeJohHFyPIVpLCwklh+5RxxaK HhXSZG7gjFAEb5k+y+rtC8MkQjdkhJOtJuuQQo6rLAkHjsSYzqsIUC13cecsa04XxchO Axlsdhx+RnrsfM09pUkmBF1AUvmiCadqS4UEc91ewD9SMxG3V5heH85i3gDSMeRIaL84 /7YcmyYQ5Df3Y1TCMyyVKKsC8VD1KzAgdB3Kh/yTuPmYKjXLyZWp2EdkHhFGZ6f6kM+l pevzyYaOe1vFXuA1cBxRxEuSipDRpawc1G5NDmOYCnjeT7ndMzehEl7tOBtU6lJh55v+ /OjQ== X-Gm-Message-State: AIVw1107u0jNhCZqIEL/ji7u1rDU8201A5Qc3i2hoF3zKUfE8nnpQOIv joljZh423SVyIVQrW1k= X-Received: by 10.107.13.1 with SMTP id 1mr5051037ion.110.1502242842101; Tue, 08 Aug 2017 18:40:42 -0700 (PDT) Received: from localhost.localdomain (50-108-95-251.adr01.mskg.mi.frontiernet.net. [50.108.95.251]) by smtp.gmail.com with ESMTPSA id r40sm1320994ioi.57.2017.08.08.18.40.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Aug 2017 18:40:41 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/2] NFSv4: Use correct inode in _nfs4_opendata_to_nfs4_state() Date: Tue, 8 Aug 2017 21:40:20 -0400 Message-Id: <20170809014021.42909-1-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.4 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When doing open by filehandle we don't really want to lookup a new inode, but rather update the one we've got. Add a helper which does this for us. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1c73aa92b079..71c469bd1ae9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1659,6 +1659,28 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) return state; } +static struct inode * +nfs4_opendata_get_inode(struct nfs4_opendata *data) +{ + struct inode *inode; + + switch (data->o_arg.claim) { + case NFS4_OPEN_CLAIM_NULL: + case NFS4_OPEN_CLAIM_DELEGATE_CUR: + case NFS4_OPEN_CLAIM_DELEGATE_PREV: + if (!(data->f_attr.valid & NFS_ATTR_FATTR)) + return ERR_PTR(-EAGAIN); + inode = nfs_fhget(data->dir->d_sb, &data->o_res.fh, + &data->f_attr, data->f_label); + break; + default: + inode = d_inode(data->dentry); + ihold(inode); + nfs_refresh_inode(inode, &data->f_attr); + } + return inode; +} + static struct nfs4_state * _nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data) { @@ -1672,10 +1694,7 @@ _nfs4_opendata_to_nfs4_state(struct nfs4_opendata *data) goto out; } - ret = -EAGAIN; - if (!(data->f_attr.valid & NFS_ATTR_FATTR)) - goto err; - inode = nfs_fhget(data->dir->d_sb, &data->o_res.fh, &data->f_attr, data->f_label); + inode = nfs4_opendata_get_inode(data); ret = PTR_ERR(inode); if (IS_ERR(inode)) goto err; @@ -2071,7 +2090,6 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata) data->o_arg.open_bitmap = &nfs4_open_noattr_bitmap[0]; case NFS4_OPEN_CLAIM_FH: task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_NOATTR]; - nfs_copy_fh(&data->o_res.fh, data->o_arg.fh); } data->timestamp = jiffies; if (nfs4_setup_sequence(data->o_arg.server->nfs_client,