Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / linux / page-flags.h

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 7baf0fee100fd9a6870333aa2716047f31cd82c3..8304959ad33641b892f05fb216466b691b871caa 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -319,13 +319,23 @@ CLEARPAGEFLAG(Uptodate, uptodate)
 extern void cancel_dirty_page(struct page *page, unsigned int account_size);
 
 int test_clear_page_writeback(struct page *page);
-int test_set_page_writeback(struct page *page);
+int __test_set_page_writeback(struct page *page, bool keep_write);
+
+#define test_set_page_writeback(page)                  \
+       __test_set_page_writeback(page, false)
+#define test_set_page_writeback_keepwrite(page)        \
+       __test_set_page_writeback(page, true)
 
 static inline void set_page_writeback(struct page *page)
 {
        test_set_page_writeback(page);
 }
 
+static inline void set_page_writeback_keepwrite(struct page *page)
+{
+       test_set_page_writeback_keepwrite(page);
+}
+
 #ifdef CONFIG_PAGEFLAGS_EXTENDED
 /*
  * System with lots of page flags available. This allows separate