Andrew,

This patch fixed the 'pdflush stuck in D state' bug
        http://bugzilla.kernel.org/show_bug.cgi?id=9291
and should be pushed to mainline ASAP.
---

When JFS decides to drop a dirty metapage, it simply clears the META_dirty bit
and leave alone the PG_dirty and PAGECACHE_TAG_DIRTY bits.

When such no-write page goes to metapage_writepage(), the `relic'
PAGECACHE_TAG_DIRTY tag should be cleared, to prevent pdflush from
repeatedly trying to sync them.

Also, avoid the redirty when a bio submission is planned.

Tested-by: Markus Rehbach <[EMAIL PROTECTED]>
Signed-off-by: Fengguang Wu <[EMAIL PROTECTED]> 
---

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index f5cd8d3..0c3ffc4 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -353,7 +353,8 @@ static int metapage_writepage(struct page *page, struct 
writeback_control *wbc)
 {
        struct bio *bio = NULL;
        unsigned int block_offset;      /* block offset of mp within page */
-       struct inode *inode = page->mapping->host;
+       struct address_space *mapping = page->mapping;
+       struct inode *inode = mapping->host;
        unsigned int blocks_per_mp = JFS_SBI(inode->i_sb)->nbperpage;
        unsigned int len;
        unsigned int xlen;
@@ -449,9 +450,15 @@ static int metapage_writepage(struct page *page, struct 
writeback_control *wbc)
                        goto dump_bio;
 
                submit_bio(WRITE, bio);
-       }
-       if (redirty)
+       } else if (redirty) {
                redirty_page_for_writepage(wbc, page);
+       } else {
+               write_lock_irq(&mapping->tree_lock);
+               radix_tree_tag_clear(&mapping->page_tree,
+                               page_index(page),
+                               PAGECACHE_TAG_DIRTY);
+               write_unlock_irq(&mapping->tree_lock);
+       }
 
        unlock_page(page);
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to