From patchwork Fri Nov 3 11:35:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10039833 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 CA6246032D for ; Fri, 3 Nov 2017 11:35:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA364295B1 for ; Fri, 3 Nov 2017 11:35:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF269295B8; Fri, 3 Nov 2017 11:35:59 +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 66304295B1 for ; Fri, 3 Nov 2017 11:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756013AbdKCLf6 (ORCPT ); Fri, 3 Nov 2017 07:35:58 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:46710 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755966AbdKCLf5 (ORCPT ); Fri, 3 Nov 2017 07:35:57 -0400 Received: by mail-io0-f193.google.com with SMTP id 101so5586941ioj.3 for ; Fri, 03 Nov 2017 04:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BDSoTjacggO1qb3O69/65o5vs+qqyVT9BHaz0v+FvBM=; b=Rxs52ij9C7KCxX2a9wLXsf7RCVYCSMX0+zfmSoX94Q08/UOQ4/XjYmszKcxeoZpvua DXNOeWjvqeBE2uGQf3kqww6dnMfiNg1CVZuuAlHyBPPFdBknw2Ha45gx4GXN7azBQ378 U+S+ZrW/Xhc1nxGqXYVzIjWHwLQ5c+daye5sYp/ESEPHbUuKmQIiqKclUOsUXO/J4b9y TxkNmX+IkvCrc90cOzsl4lr1hXFWUqWCNnUBcRvl8UTJ+ZmZcM2r1iiDuE3N9R0Vd158 +GEatv8Lwj8g6g2I2yCEoeiovaXfFaifAjqeCwizhJs0FhmIyRsGkZVdLeq6Q0w1gt99 W3rg== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BDSoTjacggO1qb3O69/65o5vs+qqyVT9BHaz0v+FvBM=; b=F2I9pbdfY22URAdaspoFV36QTP0ZIPf8x4nX+0YZEk6y4tnI15GeFyRUwtBsA8By+w 0bs0KqwfomTXWKuZ5/e912kmZaXkgiLxueNJ6RIMtgV4CcknLt11EpT558RCABPESnqt vds7RJtz8/qUPr3bWLPtNwYYuS/ZZ8JSZRRk01c4TeLIfSj6lfHjCXsfpgJEWG+5XS8x xTtYKMeMZhhmkQ722OdqgnYx+BGQGrK7AYKpWJ17ayiD9DJbYJLWuwh98oJB3y2kMQGJ 7LG+rf3HVMtH8y8rb7K25wwF30KrEfo1+GNBTjNvOKEz0iUV7bnrl7/a9qOUcOvd7K/w 1XyA== X-Gm-Message-State: AMCzsaWbcTcyKoc4WiDi0XpdtZQj4Pv/UlCP4Iz1YYt0vtY5iavJJXuj GmcqLFSNwrjTu+4TlF5+NQ== X-Google-Smtp-Source: ABhQp+S+eDnVeZLA6CNEnNk5sfsvdgkIb2/rwa8a3YjpyIXM8tt2Kx2Yyj70BYlHADpvfTffGilgFw== X-Received: by 10.36.110.71 with SMTP id w68mr7080191itc.113.1509708957088; Fri, 03 Nov 2017 04:35:57 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id k2sm2667287iok.43.2017.11.03.04.35.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 04:35:55 -0700 (PDT) From: Trond Myklebust To: Benjamin Coddington , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v5 04/10] NFS: Fix a typo in nfs_rename() Date: Fri, 3 Nov 2017 07:35:33 -0400 Message-Id: <20171103113539.5551-5-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103113539.5551-4-trond.myklebust@primarydata.com> References: <20171103113539.5551-1-trond.myklebust@primarydata.com> <20171103113539.5551-2-trond.myklebust@primarydata.com> <20171103113539.5551-3-trond.myklebust@primarydata.com> <20171103113539.5551-4-trond.myklebust@primarydata.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 On successful rename, the "old_dentry" is retained and is attached to the "new_dir", so we need to call nfs_set_verifier() accordingly. Signed-off-by: Trond Myklebust --- fs/nfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 5ceaeb1f6fb6..9dda2e0ef85e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -2064,7 +2064,7 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, * should mark the directories for revalidation. */ d_move(old_dentry, new_dentry); - nfs_set_verifier(new_dentry, + nfs_set_verifier(old_dentry, nfs_save_change_attribute(new_dir)); } else if (error == -ENOENT) nfs_dentry_handle_enoent(old_dentry);