From 8665bd53f2f2e27e5511d90428cb3f60e6d0ce15 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 20:50:12 +0200 Subject: Merging upstream version 6.8.9. Signed-off-by: Daniel Baumann --- fs/zonefs/file.c | 2 +- fs/zonefs/super.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'fs/zonefs') diff --git a/fs/zonefs/file.c b/fs/zonefs/file.c index 897b12ec61..dba5dcb62b 100644 --- a/fs/zonefs/file.c +++ b/fs/zonefs/file.c @@ -180,7 +180,7 @@ const struct address_space_operations zonefs_file_aops = { .invalidate_folio = iomap_invalidate_folio, .migrate_folio = filemap_migrate_folio, .is_partially_uptodate = iomap_is_partially_uptodate, - .error_remove_page = generic_error_remove_page, + .error_remove_folio = generic_error_remove_folio, .swap_activate = zonefs_swap_activate, }; diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index a46fd023ec..b6e8e7c962 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -757,8 +757,6 @@ static struct dentry *zonefs_lookup(struct inode *dir, struct dentry *dentry, inode = zonefs_get_dir_inode(dir, dentry); else inode = zonefs_get_file_inode(dir, dentry); - if (IS_ERR(inode)) - return ERR_CAST(inode); return d_splice_alias(inode, dentry); } -- cgit v1.2.3