Factor outstanding I/O error handling
Subsystems (6)
PATCH 1/2 Factor outstanding I/O error handling
Against 2.6.20-rc2, first some cleanup, then a bug fix.
Signature · 1 line
Guillaume
Cleanup: setting an outstanding error on a mapping was open coded too many times. Factor it out in mapping_set_error().
Signed-off-by Guillaume Chazarain <[email protected]>
---
fs/gfs2/glops.c | 5 +---- fs/mpage.c | 16 ++-------------- include/linux/pagemap.h | 10 ++++++++++ mm/page-writeback.c | 7 +------ mm/vmscan.c | 8 ++------ 5 files changed, 16 insertions(+), 30 deletions(-)
fs/gfs2/glops.c +1 -4
@@ -213,10 +213,7 @@ static void inode_go_sync(struct gfs2_glif (ip) {struct address_space *mapping = ip->i_inode.i_mapping;int error =filemap_fdatawait (mapping); -if (error == -ENOSPC ) -set_bit (AS_ENOSPC , &mapping->flags); -else if (error) -set_bit (AS_EIO , &mapping->flags); +mapping_set_error (mapping, error); }clear_bit (GLF_DIRTY , &gl->gl_flags);gfs2_ail_empty_gl (gl);
fs/mpage.c +2 -14
@@ -663,12 +663,7 @@ confused:/* * The caller has a ref on the inode, so *mapping is stable */ -if (*ret) { -if (*ret == -ENOSPC ) -set_bit (AS_ENOSPC , &mapping->flags); -else -set_bit (AS_EIO , &mapping->flags); - } +mapping_set_error (mapping, *ret); out:return bio; }
@@ -776,14 +771,7 @@ retry:if (writepage) { ret = (*writepage)(page, wbc); -if (ret) { -if (ret == -ENOSPC ) -set_bit (AS_ENOSPC , - &mapping->flags); -else -set_bit (AS_EIO , - &mapping->flags); - } +mapping_set_error (mapping, ret); }else { bio = __mpage_writepage(bio, page, get_block, &last_block_in_bio, &ret, wbc,
include/linux/pagemap.h +10 -0
@@ -19,6 +19,16 @@#define AS_EIO (__GFP_BITS_SHIFT + 0)/* IO error on async write */ #define AS_ENOSPC (__GFP_BITS_SHIFT + 1)/* ENOSPC on async write */ +static inline void mapping_set_error (struct address_space * mapping,int error) +{ +if (error) { +if (error == -ENOSPC ) +set_bit (AS_ENOSPC , &mapping->flags); +else +set_bit (AS_EIO , &mapping->flags); + } +} +static inline gfp_t mapping_gfp_mask (struct address_space * mapping) {return (__force gfp_t )mapping->flags & __GFP_BITS_MASK;
mm/page-writeback.c +1 -6
@@ -651,12 +651,7 @@ retry: } ret = (*writepage)(page, wbc); -if (ret) { -if (ret == -ENOSPC ) -set_bit (AS_ENOSPC , &mapping->flags); -else -set_bit (AS_EIO , &mapping->flags); - } +mapping_set_error (mapping, ret);if (unlikely (ret ==AOP_WRITEPAGE_ACTIVATE ))unlock_page (page);
mm/vmscan.c +2 -6
@@ -284,12 +284,8 @@ static void handle_write_error(struct ad struct page *page, int error) {lock_page (page ); -if (page_mapping (page) == mapping) { -if (error == -ENOSPC ) -set_bit (AS_ENOSPC , &mapping->flags); -else -set_bit (AS_EIO , &mapping->flags); - } +if (page_mapping (page) == mapping) +mapping_set_error (mapping, error);unlock_page (page); }