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
This commit is contained in:
+1
-1
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user