From c7e22c9fe83720a8a07a6e2f1a93360659c63d13 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 20 Jan 2009 10:29:46 +0000
Subject: [PATCH] --- yaml --- r: 135931 b: refs/heads/master c:
 af5df56688acfb75c1b15b4e000ec5e82a9cdc29 h: refs/heads/master i:   135929:
 fa37da839d5c25dfdcea85a35c8e2d8fa8e40633   135927:
 964139fdb03789bdef6a29ce696bf6e95d4839bb v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/fs.h | 45 +++++++++++++++++++++++++++++++++-------
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7f02955be875..37b39a2245be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2aca5e529a2499d454c41e01f59f1d5fe4a1364
+refs/heads/master: af5df56688acfb75c1b15b4e000ec5e82a9cdc29
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index d84020b7e676..5f74d616cd7d 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1800,13 +1800,44 @@ static inline int break_lease(struct inode *inode, unsigned int mode)
 	return 0;
 }
 #else /* !CONFIG_FILE_LOCKING */
-#define locks_mandatory_locked(a) ({ 0; })
-#define locks_mandatory_area(a, b, c, d, e) ({ 0; })
-#define __mandatory_lock(a) ({ 0; })
-#define mandatory_lock(a) ({ 0; })
-#define locks_verify_locked(a) ({ 0; })
-#define locks_verify_truncate(a, b, c) ({ 0; })
-#define break_lease(a, b) ({ 0; })
+static inline int locks_mandatory_locked(struct inode *inode)
+{
+	return 0;
+}
+
+static inline int locks_mandatory_area(int rw, struct inode *inode,
+				       struct file *filp, loff_t offset,
+				       size_t count)
+{
+	return 0;
+}
+
+static inline int __mandatory_lock(struct inode *inode)
+{
+	return 0;
+}
+
+static inline int mandatory_lock(struct inode *inode)
+{
+	return 0;
+}
+
+static inline int locks_verify_locked(struct inode *inode)
+{
+	return 0;
+}
+
+static inline int locks_verify_truncate(struct inode *inode, struct file *filp,
+					size_t size)
+{
+	return 0;
+}
+
+static inline int break_lease(struct inode *inode, unsigned int mode)
+{
+	return 0;
+}
+
 #endif /* CONFIG_FILE_LOCKING */
 
 /* fs/open.c */