From 2a18447038ce7bc3016d2405855b3b773009fb35 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Thu, 21 Jul 2011 13:55:37 -0700
Subject: [PATCH] --- yaml --- r: 257406 b: refs/heads/master c:
 ed70afcd6e795e3de98df56f1cd0f898fbf641a7 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/fs.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d2c507a61563..35c7dcd12fda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 295cc522c2b2834b302424e41ebb5846df6d61bd
+refs/heads/master: ed70afcd6e795e3de98df56f1cd0f898fbf641a7
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index e0569e4ab2d5..b224dc468a23 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -2423,6 +2423,10 @@ static inline ssize_t blockdev_direct_IO(int rw, struct kiocb *iocb,
 				    offset, nr_segs, get_block, NULL, NULL,
 				    DIO_LOCKING | DIO_SKIP_HOLES);
 }
+#else
+static inline void inode_dio_wait(struct inode *inode)
+{
+}
 #endif
 
 extern const struct file_operations generic_ro_fops;