From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95BA96FA3 for ; Thu, 28 Dec 2023 12:10:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="iYZ1SlJz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D522C433C8; Thu, 28 Dec 2023 12:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1703765424; bh=sMreVnYAUavVgAAjp9kkciAzEklKfYjL9bPG5qLQmEA=; h=Subject:To:Cc:From:Date:From; b=iYZ1SlJzW7GYG2Zf9tu16jtpW39tQh+tisCLnjBRZ9uTRm1MRtU2uFVi6k7QdnY4a JjZ6aAwqrO53KzwW8Xye7PfkIz0ddqxgmPDBbI+UquYXFcb0PYln/AY/bzysbZqqoI AE7ffQ0McGHiOwmInVPyPkZC1fYLoPR3//NAMUDg= Subject: FAILED: patch "[PATCH] fs: cifs: Fix atime update check" failed to apply to 6.1-stable tree To: wozizhi@huawei.com,stfrench@microsoft.com Cc: From: Date: Thu, 28 Dec 2023 12:10:20 +0000 Message-ID: <2023122819-squatted-triceps-048a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 01fe654f78fd1ea4df046ef76b07ba92a35f8dbe # git commit -s git send-email --to '' --in-reply-to '2023122819-squatted-triceps-048a@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 01fe654f78fd ("fs: cifs: Fix atime update check") 8f22ce708883 ("client: convert to new timestamp accessors") 9448765397b6 ("smb: convert to ctime accessor functions") bc2390f2c884 ("cifs: update the ctime on a partial page write") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 01fe654f78fd1ea4df046ef76b07ba92a35f8dbe Mon Sep 17 00:00:00 2001 From: Zizhi Wo Date: Wed, 13 Dec 2023 10:23:53 +0800 Subject: [PATCH] fs: cifs: Fix atime update check Commit 9b9c5bea0b96 ("cifs: do not return atime less than mtime") indicates that in cifs, if atime is less than mtime, some apps will break. Therefore, it introduce a function to compare this two variables in two places where atime is updated. If atime is less than mtime, update it to mtime. However, the patch was handled incorrectly, resulting in atime and mtime being exactly equal. A previous commit 69738cfdfa70 ("fs: cifs: Fix atime update check vs mtime") fixed one place and forgot to fix another. Fix it. Fixes: 9b9c5bea0b96 ("cifs: do not return atime less than mtime") Cc: stable@vger.kernel.org Signed-off-by: Zizhi Wo Signed-off-by: Steve French diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index cf17e3dd703e..32a8525415d9 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -4671,7 +4671,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page, /* we do not want atime to be less than mtime, it broke some apps */ atime = inode_set_atime_to_ts(inode, current_time(inode)); mtime = inode_get_mtime(inode); - if (timespec64_compare(&atime, &mtime)) + if (timespec64_compare(&atime, &mtime) < 0) inode_set_atime_to_ts(inode, inode_get_mtime(inode)); if (PAGE_SIZE > rc)