summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-12-13 11:09:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2023-12-13 11:09:58 -0800
commit5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd (patch)
tree570df1a3109d97b5b15b7e1a781095283f3335d7
parentaf2a9c6a83a61bcaeb0fa4edc74762448926ef1c (diff)
parent485053bb81c81a122edd982b263277e65d7485c5 (diff)
downloadlinux-5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd.tar.gz
linux-5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd.tar.bz2
linux-5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd.zip
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull ufs fix from Al Viro: "ufs got broken this merge window on folio conversion - calling conventions for filemap_lock_folio() are not the same as for find_lock_page()" * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix ufs_get_locked_folio() breakage
-rw-r--r--fs/ufs/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/util.c b/fs/ufs/util.c
index 13ba34e6d64f..2acf191eb89e 100644
--- a/fs/ufs/util.c
+++ b/fs/ufs/util.c
@@ -245,7 +245,7 @@ struct folio *ufs_get_locked_folio(struct address_space *mapping,
{
struct inode *inode = mapping->host;
struct folio *folio = filemap_lock_folio(mapping, index);
- if (!folio) {
+ if (IS_ERR(folio)) {
folio = read_mapping_folio(mapping, index, NULL);
if (IS_ERR(folio)) {