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

[Randy Dunlap]

On Thu, 14 Aug 2008 11:16:33 +0200 Thomas Petazzoni wrote:

> Le Wed, 13 Aug 2008 14:09:31 -0400,
> "J. Bruce Fields" <bfields@xxxxxxxxxxxx> 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.

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

Thanks.

> ---
> 
> 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@xxxxxxxxxxxxxxxxxx>
> 
> ---
>  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 */
> 
> 
> -- 

---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
--
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/