Merge signal handler branch

[linux-2.6] / drivers / block / rd.c

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 1c54f46d3f701bff756cfcd385a5eac38ac65a8c..940bfd7951e5c1c582a672447b65dd28ff1367c7 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -186,7 +186,8 @@ static int ramdisk_writepages(struct address_space *mapping,
  */
 static int ramdisk_set_page_dirty(struct page *page)
 {
-       SetPageDirty(page);
+       if (!TestSetPageDirty(page))
+               return 1;
        return 0;
 }