From patchwork Thu May 10 19:28:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10392303 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 902F46028E for ; Thu, 10 May 2018 19:29:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 808C528D09 for ; Thu, 10 May 2018 19:29:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7492528D0C; Thu, 10 May 2018 19:29:35 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, 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 1BD3928D09 for ; Thu, 10 May 2018 19:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751449AbeEJT3d (ORCPT ); Thu, 10 May 2018 15:29:33 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:38288 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbeEJT3V (ORCPT ); Thu, 10 May 2018 15:29:21 -0400 Received: by mail-it0-f65.google.com with SMTP id q4-v6so4521823ite.3 for ; Thu, 10 May 2018 12:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=E6PyojM/ulvcLk2lWs72S/6Qnt5sQBbxo6VM0bpPpcU=; b=UJzG0RuwBxptdbJYP6phSegx4HRreosDtWV4qOQvGg2WsUZySDaj+hNBPBqAdAnndC 5wGOLnJR1gDksOTL+Jcv3ongZ0C+1R2sr28c2qLrfgKhYOeqwsihTP6L39VOdEuoPeBe p13w9a8O5K8gCRWXWWofYMbuWzZXGvaicicd6b+QzaKNbuA05/GWD/O0wTKpSavJUfoh 6tgGAS3CsLbLNrh4fdhJ/9HxaAJS9UKrlT7E0qQR8/jCi82IbDEIb7BlpreZbM/4t3Ke vk7WLR6oQUitvRIKlHDj7pOLM9pntlCq1CD93LhOoiZgl3JT/7lsi6elHy78QsshLt5r ZaZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=E6PyojM/ulvcLk2lWs72S/6Qnt5sQBbxo6VM0bpPpcU=; b=RUogNaRBi2mDvNlcAVcwFbfvCgDziB2cbR9GpvAZq3xNsFWi8BVKMmD8S8lBWzEyTl yF4OuyKDJgfB8N9BaCoQvaGh0Htu9ircdi2pzpKoLvYmcizF6c12gSvZ+88ayDXTyG4k jWbE+G0Q2qXt3PeX+ns+MO8H489tueYt4cJsBAyMRny56/Hn2x036BKVhddRQPDckb+7 VJgq9wLk4ySHpjwEAI6xUSMFqwKghu3MfMb6tzRZ0en9TS8+roouI5fznYdKjYaqtJ9s Y09ShYGewuKES8pr0iKETc8iOvd1SfPmMorN6m3jzXhH5qI5uNsWalEOsyuku+06n3aQ Y2JA== X-Gm-Message-State: ALKqPwfUNbButh0xxqqP9EjRPsPeootvDcGRylbF8AN60hxbG7Xi7Vui 7jUg+jS0sTsdPsEaplEhEWF+bmQ= X-Google-Smtp-Source: AB8JxZqffKM82vpTyoAWW9WTm4un6HB6SFPcYwbUhn8xylOh5KWppiS06irE/6ypD1w9UX75UlnqLw== X-Received: by 2002:a24:8ac2:: with SMTP id v185-v6mr314187itd.86.1525980560642; Thu, 10 May 2018 12:29:20 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id i12-v6sm713921iod.85.2018.05.10.12.29.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 May 2018 12:29:19 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/3] NFS: Optimise away the close-to-open GETATTR when we have NFSv4 OPEN Date: Thu, 10 May 2018 15:28:56 -0400 Message-Id: <20180510192858.18539-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 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 NFSv4 should not need to perform an extra close-to-open GETATTR as part of the process of looking up a regular file, since the OPEN call will do that for us. Signed-off-by: Trond Myklebust --- fs/nfs/dir.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 73f8b43d988c..4a73bd8b4517 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1012,13 +1012,25 @@ int nfs_lookup_verify_inode(struct inode *inode, unsigned int flags) if (IS_AUTOMOUNT(inode)) return 0; + + if (flags & LOOKUP_OPEN) { + switch (inode->i_mode & S_IFMT) { + case S_IFREG: + /* A NFSv4 OPEN will revalidate later */ + if (server->caps & NFS_CAP_ATOMIC_OPEN) + goto out; + /* Fallthrough */ + case S_IFDIR: + if (server->flags & NFS_MOUNT_NOCTO) + break; + /* NFS close-to-open cache consistency validation */ + goto out_force; + } + } + /* VFS wants an on-the-wire revalidation */ if (flags & LOOKUP_REVAL) goto out_force; - /* This is an open(2) */ - if ((flags & LOOKUP_OPEN) && !(server->flags & NFS_MOUNT_NOCTO) && - (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) - goto out_force; out: return (inode->i_nlink == 0) ? -ENOENT : 0; out_force: