From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF892C3A589 for ; Tue, 20 Aug 2019 13:40:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B99522087E for ; Tue, 20 Aug 2019 13:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308438; bh=yFL7ImAVG37bqNXnvntkZhTZPNTbT1g7r5HC8Hs6xr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=smNxrF9iPxqtxZTUJD4n/AXRxeQVolCw9ex90vC8E2dHSHqNea6D4TF+tkKsUKK9g MoboXstPTvkVQIQlR6il9y/+noEmU+D7r2FfNehs0yFC675UbpQIk7zBoE/F6rfZZV ZPqcxgrOJvmyqGel56kZmDDAn9qSKi/oTkALrWqs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730156AbfHTNkh (ORCPT ); Tue, 20 Aug 2019 09:40:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:35292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730117AbfHTNkf (ORCPT ); Tue, 20 Aug 2019 09:40:35 -0400 Received: from sasha-vm.mshome.net (unknown [12.236.144.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40BC722DA7; Tue, 20 Aug 2019 13:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566308434; bh=yFL7ImAVG37bqNXnvntkZhTZPNTbT1g7r5HC8Hs6xr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y45aG5zWjtJzlrSneK2kRWnAYlAvbgpK9Xnp3QUDhTiGxQvHzukhCrAeooLq9tG2f VKRr+iMWVlrUTM9q7MiiNAndRi+bgk3mBeIytppPYr+8o8oXrh3z99VuOwDeOuSbz5 5KGNFT0LkMllFTNpTYMFom/NwSUJhjPkiGyIo4xY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Howells , Sasha Levin , linux-afs@lists.infradead.org Subject: [PATCH AUTOSEL 5.2 06/44] afs: Fix off-by-one in afs_rename() expected data version calculation Date: Tue, 20 Aug 2019 09:39:50 -0400 Message-Id: <20190820134028.10829-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190820134028.10829-1-sashal@kernel.org> References: <20190820134028.10829-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells [ Upstream commit 37c0bbb3326674940e657118306ac52364314523 ] When afs_rename() calculates the expected data version of the target directory in a cross-directory rename, it doesn't increment it as it should, so it always thinks that the target inode is unexpectedly modified on the server. Fixes: a58823ac4589 ("afs: Fix application of status and callback to be under same lock") Signed-off-by: David Howells Signed-off-by: Sasha Levin --- fs/afs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/afs/dir.c b/fs/afs/dir.c index da9563d62b327..9750ac70f8ffb 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -1807,7 +1807,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, afs_end_vnode_operation(&fc); goto error_rehash; } - new_data_version = new_dvnode->status.data_version; + new_data_version = new_dvnode->status.data_version + 1; } else { new_data_version = orig_data_version; new_scb = &scb[0]; -- 2.20.1