[PATCH] Make XFS use BH_Unwritten and BH_Delay correctly

Don't hide buffer_unwritten behind buffer_delay() and remove the hack that
clears unexpected buffer_unwritten() states now that it can't happen.

Signed-off-by: Dave Chinner <dgc@sgi.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Timothy Shimmin <tes@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index f3cc4ab20ba03d824991bd9168331c1f2cbb1c8e..143ffc851c9d21376b1c928394544d59443b87e9 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -56,8 +56,6 @@ xfs_count_page_state(
        do {
                if (buffer_uptodate(bh) && !buffer_mapped(bh))
                        (*unmapped) = 1;
-               else if (buffer_unwritten(bh) && !buffer_delay(bh))
-                       clear_buffer_unwritten(bh);
                else if (buffer_unwritten(bh))
                        (*unwritten) = 1;
                else if (buffer_delay(bh))
@@ -1272,7 +1270,6 @@ __xfs_get_blocks(
                        if (direct)
                                bh_result->b_private = inode;
                        set_buffer_unwritten(bh_result);
-                       set_buffer_delay(bh_result);
                }
        }