Re: linux-next: Tree for August 13 (nfsd)

[Thomas Petazzoni <thomas.petazzoni@free-electrons.com>]

Le Wed, 13 Aug 2008 14:09:31 -0400,
"J. Bruce Fields" <bfields@fieldses.org> a écrit :

> Looks like that's just two more functions that need to be stubbed out
> in the case where CONFIG_FILE_LOCKING is undefined?--hopefully Thomas
> Petazzoni (cc'd) could be talked into reproducing this and sending me
> an incremental fix....

Here is an incremental fix.

---

Fixup configure out fs locks support

This patch adds a few more stubs required to get NFS server to compile
properly with CONFIG_FILE_LOCKING=n.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---
 include/linux/fs.h |    2 ++
 1 file changed, 2 insertions(+)

Index: linuxdev/include/linux/fs.h
===================================================================
--- linuxdev.orig/include/linux/fs.h
+++ linuxdev/include/linux/fs.h
@@ -1050,6 +1050,8 @@
 #define __break_lease(a, b) ({ 0; })
 #define lease_get_mtime(a, b) ({ })
 #define generic_setlease(a, b, c) ({ -EINVAL; })
+#define vfs_setlease(a, b, c) ({ -EINVAL; })
+#define lease_modify(a, b) ({ -EINVAL; })
 #define lock_may_read(a, b, c) ({ 1; })
 #define lock_may_write(a, b, c) ({ 1; })
 #endif /* !CONFIG_FILE_LOCKING */


-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com