From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Fri, 16 Jan 2009 10:20:03 +0000 Subject: [Cluster-devel] Re: mmotm 2009-01-14-20-31 uploaded (gfs2) In-Reply-To: <496F8AED.3020604@oracle.com> References: <200901150432.n0F4WI66023742@imap1.linux-foundation.org> <496F8AED.3020604@oracle.com> Message-ID: <1232101203.3554.3.camel@localhost.localdomain> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, On Thu, 2009-01-15 at 11:13 -0800, Randy Dunlap wrote: > akpm at 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.