Re: [PATCH] lockd: fix FILE_LOCKING=n build error

From: Felix Blyakher
Date: Tue Apr 28 2009 - 11:38:26 EST



On Apr 28, 2009, at 10:22 AM, Randy Dunlap wrote:

From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

lockd/svclock.c is missing a header file <linux/fs.h>.

<linux/fs.h> is missing a definition of locks_release_private()
for the config case of FILE_LOCKING=n, causing a build error:

fs/lockd/svclock.c:330: error: implicit declaration of function 'locks_release_private'

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

Heh, I did miss it in my original patch, where I added
locks_release_private().
The fix looks good, thanks.

Reviewed-by: Felix Blyakher <felixb@xxxxxxx>


---
fs/lockd/svclock.c | 1 +
include/linux/fs.h | 4 ++++
2 files changed, 5 insertions(+)

--- linux-next-20090428.orig/fs/lockd/svclock.c
+++ linux-next-20090428/fs/lockd/svclock.c
@@ -22,6 +22,7 @@

#include <linux/types.h>
#include <linux/errno.h>
+#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/smp_lock.h>
--- linux-next-20090428.orig/include/linux/fs.h
+++ linux-next-20090428/include/linux/fs.h
@@ -1183,6 +1183,10 @@ static inline void locks_remove_flock(st
return;
}

+static inline void locks_release_private(struct file_lock *fl)
+{
+}
+
static inline void posix_test_lock(struct file *filp, struct file_lock *fl)
{
return;

--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux- fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/