ceph: fix NULL vs IS_ERR() bug in ceph_zero_partial_page()
Subsystems (2)
PATCH 1/1 ceph: fix NULL vs IS_ERR() bug in ceph_zero_partial_page()
The filemap_lock_folio() never returns NULL. It returns error pointers. Update the checking to match.
Fixes 483239f03149 ("ceph: convert ceph_zero_partial_page() to use a folio")
Signed-off-by Dan Carpenter <[email protected]>
--- fs/ceph/file.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/ceph/file.c +7 -6
@@ -2536,12 +2536,13 @@ static inline void ceph_zero_partial_page(struct inode *inode,struct folio *folio; folio =filemap_lock_folio (inode->i_mapping, offset >>PAGE_SHIFT ); -if (folio) { -folio_wait_writeback (folio); -folio_zero_range (folio,offset_in_folio (folio, offset), size); -folio_unlock (folio); -folio_put (folio); - } +if (IS_ERR (folio)) +return ; + +folio_wait_writeback (folio); +folio_zero_range (folio,offset_in_folio (folio, offset), size); +folio_unlock (folio); +folio_put (folio); } static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset,
Signature · 1 line
2.47.2
Quoted 23 lines · Dan Carpenter
The
filemap_lock_folio()never returns NULL. It returns error pointers. Update the checking to match.Fixes 483239f03149 ("ceph: convert ceph_zero_partial_page() to use a folio")Signed-off-by Dan Carpenter <[email protected]>--- fs/ceph/file.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)fs/ceph/file.c +0
-6@@ -2536,12 +2536,13 @@ static inline void ceph_zero_partial_page(struct inode *inode,struct folio *folio; folio =filemap_lock_folio (inode->i_mapping, offset >>PAGE_SHIFT ); -if (folio) { -folio_wait_writeback (folio); -folio_zero_range (folio,offset_in_folio (folio, offset), size); -folio_unlock (folio); -folio_put (folio); - }
fs/ceph/file.c static inline void ceph_zero_partial_page(struct inode *inode, · line 2548
Quoted 10 lines
fs/ceph/file.c +7
-0+if (IS_ERR (folio)) +return ; + +folio_wait_writeback (folio); +folio_zero_range (folio,offset_in_folio (folio, offset), size); +folio_unlock (folio); +folio_put (folio); } static void ceph_zero_pagecache_range(struct inode *inode, loff_t offset,
Looks good!
Reviewed-by Viacheslav Dubeyko <[email protected]>
Thanks,
Slava.