From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
patches@lists.linux.dev, David Howells <dhowells@redhat.com>,
Salvatore Bonaccorso <carnil@debian.org>,
Steve French <stfrench@microsoft.com>
Subject: [PATCH 6.1 1/4] cifs: fix flushing folio regression for 6.1 backport
Date: Sat, 13 Jan 2024 10:50:39 +0100 [thread overview]
Message-ID: <20240113094204.068608649@linuxfoundation.org> (raw)
In-Reply-To: <20240113094204.017594027@linuxfoundation.org>
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
filemap_get_folio works differenty in 6.1 vs. later kernels
(returning NULL in 6.1 instead of an error). Add
this minor correction which addresses the regression in the patch:
cifs: Fix flushing, invalidation and file size with copy_file_range()
Suggested-by: David Howells <dhowells@redhat.com>
Reported-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Tested-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/smb/client/cifsfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode
int rc = 0;
folio = filemap_get_folio(inode->i_mapping, index);
- if (IS_ERR(folio))
+ if ((!folio) || (IS_ERR(folio)))
return 0;
size = folio_size(folio);
next prev parent reply other threads:[~2024-01-13 10:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-13 9:50 [PATCH 6.1 0/4] 6.1.73-rc1 review Greg Kroah-Hartman
2024-01-13 9:50 ` Greg Kroah-Hartman [this message]
2024-01-13 20:08 ` [PATCH 6.1 1/4] cifs: fix flushing folio regression for 6.1 backport Salvatore Bonaccorso
2024-01-13 20:19 ` Greg Kroah-Hartman
2024-01-13 20:24 ` Salvatore Bonaccorso
2024-01-13 20:39 ` Greg Kroah-Hartman
2024-01-13 9:50 ` [PATCH 6.1 2/4] Revert "nfsd: call nfsd_last_thread() before final nfsd_put()" Greg Kroah-Hartman
2024-01-13 9:50 ` [PATCH 6.1 3/4] Revert "nfsd: separate nfsd_last_thread() from nfsd_put()" Greg Kroah-Hartman
2024-01-13 9:50 ` [PATCH 6.1 4/4] ipv6: remove max_size check inline with ipv4 Greg Kroah-Hartman
2024-01-13 18:43 ` [PATCH 6.1 0/4] 6.1.73-rc1 review SeongJae Park
2024-01-14 10:34 ` Pavel Machek
2024-01-14 19:38 ` Ron Economos
2024-01-14 22:01 ` Slade Watkins
2024-01-15 8:50 ` Naresh Kamboju
2024-01-15 10:23 ` Jon Hunter
2024-01-15 11:34 ` Shreeya Patel
2024-01-15 12:20 ` Conor Dooley
2024-01-15 19:09 ` Florian Fainelli
2024-01-15 19:46 ` Allen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240113094204.068608649@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=carnil@debian.org \
--cc=dhowells@redhat.com \
--cc=patches@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox