Received-SPF: pass (google.com: domain of linux-kernel+bounces-2113-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20231213022353.2983979-1-wozizhi@huawei.com>
In-Reply-To: <20231213022353.2983979-1-wozizhi@huawei.com>
From: Steve French <smfrench@gmail.com>
Date: Sat, 16 Dec 2023 00:24:23 -0600
Message-ID: <CAH2r5mvzuiYAT56SCx21A2dv-2+MfsaSRpX1fWWnMUnn9RtROg@mail.gmail.com>
Subject: Re: [PATCH -next] fs: cifs: Fix atime update check
To: Zizhi Wo <wozizhi@huawei.com>
Cc: stfrench@microsoft.com, lsahlber@redhat.com, linux-cifs@vger.kernel.org, 
	samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, 
	yangerkun@huawei.com, Jeff Layton <jlayton@kernel.org>, 
	Christian Brauner <brauner@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

added to cifs-2.6.git for-next (and added Cc: stable) pending additional te=
sting

Adding @Christian Brauner  and @Jeff Layton  since this overlaps a
recent change of theirs.


On Tue, Dec 12, 2023 at 8:25=E2=80=AFPM Zizhi Wo <wozizhi@huawei.com> wrote=
:
>
> Commit 9b9c5bea0b96 ("cifs: do not return atime less than mtime") indicat=
es
> 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")
> Signed-off-by: Zizhi Wo <wozizhi@huawei.com>
> ---
>  fs/smb/client/file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 =3D inode_set_atime_to_ts(inode, current_time(inode));
>         mtime =3D 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)
> --
> 2.39.2
>
>


--
Thanks,

Steve