diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-13 11:09:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-13 11:09:58 -0800 |
| commit | 5bd7ef53ffe5ca580e93e74eb8c81ed191ddc4bd (patch) | |
| tree | 570df1a3109d97b5b15b7e1a781095283f3335d7 | |
| parent | af2a9c6a83a61bcaeb0fa4edc74762448926ef1c (diff) | |
| parent | 485053bb81c81a122edd982b263277e65d7485c5 (diff) | |
| download | dma-buf-mainline-master.tar.gz | |
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfsmainline-master
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 13ba34e6d64ff3..2acf191eb89ede 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)) { |