Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 47e7027ea39f5183f0aadeb8148b41179fe3ee27..b6f12593c39dd76a1cd2002c93466a9370f04957 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -53,7 +53,6 @@
 #include <linux/string.h>
 #include <linux/pagemap.h>
 #include <linux/reiserfs_fs.h>
-#include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <linux/quotaops.h>
 
@@ -1459,7 +1458,7 @@ static void unmap_buffers(struct page *page, loff_t pos)
                                bh = next;
                        } while (bh != head);
                        if (PAGE_SIZE == bh->b_size) {
-                               clear_page_dirty(page);
+                               cancel_dirty_page(page, PAGE_CACHE_SIZE);
                        }
                }
        }