aboutsummaryrefslogtreecommitdiffstats
path: root/fs/mpage.c
diff options
context:
space:
mode:
authorGuillaume Chazarain <guichaz@yahoo.fr>2007-05-08 03:23:25 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:14:57 -0400
commit3e9f45bd18191bbd05468b19b7064b8da8262aba (patch)
tree06c790a9cb1afc83d170447a277e51f5a1a5f303 /fs/mpage.c
parentc83e44842074a87614c78eca70fa6467b0bc3c4a (diff)
Factor outstanding I/O error handling
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 <guichaz@yahoo.fr> Cc: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/mpage.c')
-rw-r--r--fs/mpage.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/fs/mpage.c b/fs/mpage.c
index 692a3e578fc8..fa2441f57b41 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -663,12 +663,7 @@ confused:
663 /* 663 /*
664 * The caller has a ref on the inode, so *mapping is stable 664 * The caller has a ref on the inode, so *mapping is stable
665 */ 665 */
666 if (*ret) { 666 mapping_set_error(mapping, *ret);
667 if (*ret == -ENOSPC)
668 set_bit(AS_ENOSPC, &mapping->flags);
669 else
670 set_bit(AS_EIO, &mapping->flags);
671 }
672out: 667out:
673 return bio; 668 return bio;
674} 669}
@@ -776,14 +771,7 @@ retry:
776 771
777 if (writepage) { 772 if (writepage) {
778 ret = (*writepage)(page, wbc); 773 ret = (*writepage)(page, wbc);
779 if (ret) { 774 mapping_set_error(mapping, ret);
780 if (ret == -ENOSPC)
781 set_bit(AS_ENOSPC,
782 &mapping->flags);
783 else
784 set_bit(AS_EIO,
785 &mapping->flags);
786 }
787 } else { 775 } else {
788 bio = __mpage_writepage(bio, page, get_block, 776 bio = __mpage_writepage(bio, page, get_block,
789 &last_block_in_bio, &ret, wbc, 777 &last_block_in_bio, &ret, wbc,