Date: Thu, 14 Aug 2008 18:47:52 -0400
To: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
       Stephen Rothwell <sfr@canb.auug.org.au>, neilb@suse.de,
       linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for August 13 (nfsd)
Message-ID: <20080814224752.GR23859@fieldses.org>
References: <20080813172452.14b0775c.sfr@canb.auug.org.au> <20080813104748.13848196.randy.dunlap@oracle.com> <20080813180931.GC26765@fieldses.org> <20080814111633.55f5f1e8@surf>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20080814111633.55f5f1e8@surf>
User-Agent: Mutt/1.5.18 (2008-05-17)
From: "J. Bruce Fields" <bfields@fieldses.org>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1825
Lines: 57

On Thu, Aug 14, 2008 at 11:16:33AM +0200, Thomas Petazzoni wrote:
> 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.

Thanks, I've updated the version in

        git://linux-nfs.org/~bfields/linux.git for-2.6.28

--b.


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