From patchwork Mon Jun 4 22:31:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10447399 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 93F5F6054D for ; Mon, 4 Jun 2018 22:32:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AEDA293D5 for ; Mon, 4 Jun 2018 22:32:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FCFF293F6; Mon, 4 Jun 2018 22:32:03 +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 04C98293D5 for ; Mon, 4 Jun 2018 22:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751733AbeFDWcB (ORCPT ); Mon, 4 Jun 2018 18:32:01 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:39992 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751656AbeFDWb6 (ORCPT ); Mon, 4 Jun 2018 18:31:58 -0400 Received: by mail-it0-f65.google.com with SMTP id j186-v6so984014ita.5 for ; Mon, 04 Jun 2018 15:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Kuxiy4HC88GkhjxmifMJTj4ZAQ+xNeRS3X03UfeNqSk=; b=ryGVaFf3mKZKg+nUTWqO5w1KgqRj386uytMBFDEN5gco82WNfCip4g/ujXK2BgXfhj QysCRZd0O3+r5mBAFHA6Ftkf7HQURRE2A/3EDH/xCfioqQ29zF7sm2PH4n9GkS30NVc0 0E3oJaxxPx387Qy+Cj+5XIKUHJdWQe2axRx253q7mssPBkJiR2i10wHGXCZZOd6ogttC liPiyew7U+SwrIZVbQ+peMgtEq0qiWzBgYUBsiJ/W7H36DvxGLsnKrN2/GoFwAGaf9nZ Yx/pYurBV8VJeKt38VDlgwxZjzIRq5rmxIJ/IYVQq0Oyq6I5MhWaNEqVvC2LQ5YqTAMe uibw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kuxiy4HC88GkhjxmifMJTj4ZAQ+xNeRS3X03UfeNqSk=; b=qfVhED1yWK7z60ZnVe38PBpgN5lVYhXYVzO56I24Y3KiPwbkPgY8zW9693DxVK8fyI a7jKfXSSbD7nPJkswK0MdvpK2B8Vc6/8/S6vnXEtJsdf6/IFYphyiKpTbG5C38myyR+U w7U3a9XFiYWVFOdNO6OiF7eMb5DMUfIyjimoARvy8mXyhL42hLaySaDRnxQ1sIwA4z4P tPB6DExEflh2boDeldH8UfAHcBpyPeV6d+NA/suOiWI1oMJbsQemmBOWI6Jq5nQtd2xZ EX1FB+5YVXD2EpeTr5WNLj5Hw1gbNLb+FEl/7+slz/sFgugmMkTRmxxyC5rPAGqXBAkj Mb2A== X-Gm-Message-State: APt69E33lWLedakb9LOCkqhLcRZPVJdFcGuJLIQGfGE8+3jE17vAPzu1 rf5bCUTEDPsbbA4XFXAJt5IMpu8= X-Google-Smtp-Source: ADUXVKJGhVDxbPeZne7MT5cxLP3iB3esiWxSkXLIRSAPKbf74rWUAPaDAGOTY/gI1h2+pcADOy4/rw== X-Received: by 2002:a24:45a6:: with SMTP id c38-v6mr16198402itd.65.1528151517670; Mon, 04 Jun 2018 15:31:57 -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 s5-v6sm4309480ioj.13.2018.06.04.15.31.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jun 2018 15:31:56 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 07/11] NFS: fix up nfs_setattr_update_inode Date: Mon, 4 Jun 2018 18:31:25 -0400 Message-Id: <20180604223129.121477-7-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180604223129.121477-6-trond.myklebust@hammerspace.com> References: <20180604223129.121477-1-trond.myklebust@hammerspace.com> <20180604223129.121477-2-trond.myklebust@hammerspace.com> <20180604223129.121477-3-trond.myklebust@hammerspace.com> <20180604223129.121477-4-trond.myklebust@hammerspace.com> <20180604223129.121477-5-trond.myklebust@hammerspace.com> <20180604223129.121477-6-trond.myklebust@hammerspace.com> 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 From: Trond Myklebust Always try to set the attributes, even if we don't have a valid struct nfs_fattr. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a720427e5aa3..2b7edd011d86 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -671,9 +671,13 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, spin_lock(&inode->i_lock); NFS_I(inode)->attr_gencount = fattr->gencount; - nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE - | NFS_INO_INVALID_CTIME); + if ((attr->ia_valid & ATTR_SIZE) != 0) { + nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME); + nfs_inc_stats(inode, NFSIOS_SETATTRTRUNC); + nfs_vmtruncate(inode, attr->ia_size); + } if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) { + NFS_I(inode)->cache_validity &= ~NFS_INO_INVALID_CTIME; if ((attr->ia_valid & ATTR_MODE) != 0) { int mode = attr->ia_mode & S_IALLUGO; mode |= inode->i_mode & ~S_IALLUGO; @@ -683,13 +687,45 @@ void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr, inode->i_uid = attr->ia_uid; if ((attr->ia_valid & ATTR_GID) != 0) inode->i_gid = attr->ia_gid; + if (fattr->valid & NFS_ATTR_FATTR_CTIME) + inode->i_ctime = fattr->ctime; + else + nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE + | NFS_INO_INVALID_CTIME); nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL); } - if ((attr->ia_valid & ATTR_SIZE) != 0) { - nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME); - nfs_inc_stats(inode, NFSIOS_SETATTRTRUNC); - nfs_vmtruncate(inode, attr->ia_size); + if (attr->ia_valid & (ATTR_ATIME_SET|ATTR_ATIME)) { + NFS_I(inode)->cache_validity &= ~(NFS_INO_INVALID_ATIME + | NFS_INO_INVALID_CTIME); + if (fattr->valid & NFS_ATTR_FATTR_ATIME) + inode->i_atime = fattr->atime; + else if (attr->ia_valid & ATTR_ATIME_SET) + inode->i_atime = attr->ia_atime; + else + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATIME); + + if (fattr->valid & NFS_ATTR_FATTR_CTIME) + inode->i_ctime = fattr->ctime; + else + nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE + | NFS_INO_INVALID_CTIME); + } + if (attr->ia_valid & (ATTR_MTIME_SET|ATTR_MTIME)) { + NFS_I(inode)->cache_validity &= ~(NFS_INO_INVALID_MTIME + | NFS_INO_INVALID_CTIME); + if (fattr->valid & NFS_ATTR_FATTR_MTIME) + inode->i_mtime = fattr->mtime; + else if (attr->ia_valid & ATTR_MTIME_SET) + inode->i_mtime = attr->ia_mtime; + else + nfs_set_cache_invalid(inode, NFS_INO_INVALID_MTIME); + + if (fattr->valid & NFS_ATTR_FATTR_CTIME) + inode->i_ctime = fattr->ctime; + else + nfs_set_cache_invalid(inode, NFS_INO_INVALID_CHANGE + | NFS_INO_INVALID_CTIME); } if (fattr->valid) nfs_update_inode(inode, fattr);