lkml.org 
[lkml]   [2009]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: mmotm 2009-01-14-20-31 uploaded (gfs2)
From
Date
Hi,

On Thu, 2009-01-15 at 11:13 -0800, Randy Dunlap wrote:
> akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2009-01-14-20-31 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
> >
> > and will soon be available at
> >
> > git://git.zen-sources.org/zen/mmotm.git
>
>
> when CONFIG_FILE_LOCKING=n:
>
> mmotm-2009-0114-2031/fs/gfs2/ops_file.c:746: error: 'generic_setlease' undeclared here (not in a function)
>
>
> since generic_setlease() is a macro/define in that case.
>
Hmm, it looks like I'll have to do this, in that case:

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 99d726f..4580335 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -743,7 +743,9 @@ const struct file_operations *gfs2_file_fops_nolock = &(const struct file_operat
.fsync = gfs2_fsync,
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
+#ifdef CONFIG_FILE_LOCKING
.setlease = generic_setlease,
+#endif /* CONFIG_FILE_LOCKING */
};

const struct file_operations *gfs2_dir_fops_nolock = &(const struct file_operations){

which is not ideal, but I don't see any easy way to avoid the #ifdef,

Steve.




\
 
 \ /
  Last update: 2009-01-16 11:23    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site