[PATCH] Re-dirty pages on I/O error

Lachlan McIlroy
2009-02-10T01:49:53Z

[This patch seems to have slipped through the proverbial crack.]

If we get an error in xfs_page_state_convert() - and it's not EAGAIN - then
we throw away the dirty page without converting the delayed allocation. This
leaves delayed allocations that can never be removed and confuses code that
expects a flush of the file to clear them. We need to re-dirty the page on
error so we can try again later or report that the flush failed.

Index: xfs-fixes/fs/xfs/linux-2.6/xfs_aops.c
===================================================================
--- xfs-fixes.orig/fs/xfs/linux-2.6/xfs_aops.c
+++ xfs-fixes/fs/xfs/linux-2.6/xfs_aops.c
@@ -1185,16 +1185,6 @@ error:
if (iohead)
xfs_cancel_ioend(iohead);

- /*
- * If it's delalloc and we have nowhere to put it,
- * throw it away, unless the lower layers told
- * us to try again.
- */
- if (err != -EAGAIN) {
- if (!unmapped)
- block_invalidatepage(page, 0);
- ClearPageUptodate(page);
- }
return err;
}

@@ -1223,7 +1213,7 @@ xfs_vm_writepage(
struct page *page,
struct writeback_control *wbc)
{
- int error;
+ int error = 0;
int need_trans;
int delalloc, unmapped, unwritten;
struct inode *inode = page->mapping->host;
@@ -1269,19 +1259,16 @@ xfs_vm_writepage(
* to real space and flush out to disk.
*/
error = xfs_page_state_convert(inode, page, wbc, 1, unmapped);
- if (error == -EAGAIN)
- goto out_fail;
if (unlikely(error < 0))
- goto out_unlock;
+ goto out_fail;

return 0;

out_fail:
redirty_page_for_writepage(wbc, page);
unlock_page(page);
- return 0;
-out_unlock:
- unlock_page(page);
+ if (error == -EAGAIN)
+ error = 0;
return error;
}

_______________________________________________
xfs mailing list
xfs@oss.sgi.com