From a98259fc22eb95eebafb5022fc0ecfd28e58c3a6 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 29 Oct 2009 13:59:26 +0100
Subject: [PATCH] --- yaml --- r: 172919 b: refs/heads/master c:
 b9d128f1088ea5245109dfc9bbceb128b6371a77 h: refs/heads/master i:   172917:
 8d74ef267a43bab5d761d4d60f9e2ac438a2d75c   172915:
 7c153bfa40948a12735239c67490d43db9fc1577   172911:
 e07f0fdc83097dbb510a80877afe8940f59e794f v: v3

---
 [refs]                            |  2 +-
 trunk/fs/aio.c                    |  1 +
 trunk/include/linux/backing-dev.h | 13 +++++++++++++
 trunk/include/linux/blkdev.h      | 13 -------------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index f015424c7b9f..2bfd850ca9d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a870a3a485ddf7c0dec549269ed71d169556d61c
+refs/heads/master: b9d128f1088ea5245109dfc9bbceb128b6371a77
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index cf0bef428f88..c30dfc006108 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -15,6 +15,7 @@
 #include <linux/aio_abi.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/backing-dev.h>
 #include <linux/uio.h>
 
 #define DEBUG 0
diff --git a/trunk/include/linux/backing-dev.h b/trunk/include/linux/backing-dev.h
index b449e738533a..fcbc26af00e4 100644
--- a/trunk/include/linux/backing-dev.h
+++ b/trunk/include/linux/backing-dev.h
@@ -331,4 +331,17 @@ static inline int bdi_sched_wait(void *word)
 	return 0;
 }
 
+static inline void blk_run_backing_dev(struct backing_dev_info *bdi,
+				       struct page *page)
+{
+	if (bdi && bdi->unplug_io_fn)
+		bdi->unplug_io_fn(bdi, page);
+}
+
+static inline void blk_run_address_space(struct address_space *mapping)
+{
+	if (mapping)
+		blk_run_backing_dev(mapping->backing_dev_info, NULL);
+}
+
 #endif		/* _LINUX_BACKING_DEV_H */
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 221cecd86bd3..39c601f783a0 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -823,19 +823,6 @@ static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
 	return bdev->bd_disk->queue;
 }
 
-static inline void blk_run_backing_dev(struct backing_dev_info *bdi,
-				       struct page *page)
-{
-	if (bdi && bdi->unplug_io_fn)
-		bdi->unplug_io_fn(bdi, page);
-}
-
-static inline void blk_run_address_space(struct address_space *mapping)
-{
-	if (mapping)
-		blk_run_backing_dev(mapping->backing_dev_info, NULL);
-}
-
 /*
  * blk_rq_pos()			: the current sector
  * blk_rq_bytes()		: bytes left in the entire request