commit 557510f21402f4953e6cf0c440490a1d9ba2dd46
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Mon Nov 12 20:47:24 2007 -0500
Unionfs: writepage updates
Don't set/reset the PageUptodate flag on our page. Call flush_dcache_page
on the lower page after copy_highpage, and set it uptodate. Call
set_page_dirty right before clear_page_dirty_for_io.
CC: Hugh Dickins <[EMAIL PROTECTED]>
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index b140f13..24fa02d 100644
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -56,6 +56,7 @@ static int unionfs_writepage(struct page *page, struct
writeback_control *wbc)
struct address_space *lower_mapping; /* lower inode mapping */
gfp_t mask;
+ BUG_ON(!PageUptodate(page));
inode = page->mapping->host;
lower_inode = unionfs_lower_inode(inode);
lower_mapping = lower_inode->i_mapping;
@@ -81,6 +82,8 @@ static int unionfs_writepage(struct page *page, struct
writeback_control *wbc)
/* copy page data from our upper page to the lower page */
copy_highpage(lower_page, page);
+ flush_dcache_page(lower_page);
+ SetPageUptodate(lower_page);
/*
* Call lower writepage (expects locked page). However, if we are
@@ -100,13 +103,12 @@ static int unionfs_writepage(struct page *page, struct
writeback_control *wbc)
wbc->for_writepages = 0;
BUG_ON(!lower_mapping->a_ops->writepage);
+ set_page_dirty(lower_page);
clear_page_dirty_for_io(lower_page); /* emulate VFS behavior */
err = lower_mapping->a_ops->writepage(lower_page, wbc);
wbc->for_writepages = saved_for_writepages; /* restore value */
- if (err < 0) {
- ClearPageUptodate(page);
+ if (err < 0)
goto out_release;
- }
/*
* Lower file systems such as ramfs and tmpfs, may return
@@ -130,7 +132,7 @@ static int unionfs_writepage(struct page *page, struct
writeback_control *wbc)
}
/* all is well */
- SetPageUptodate(page);
+
/* lower mtimes have changed: update ours */
unionfs_copy_attr_times(inode);
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
