* [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c
@ 2009-01-28 6:38 Manish Katiyar
[not found] ` <ea11fea30901272238t4d11ba15t8bac4cd702ea7440-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Manish Katiyar @ 2009-01-28 6:38 UTC (permalink / raw)
To: kmsmith, kandros, linux-nfs; +Cc: akpm, mkatiyar
Below patch removes the following warning ;-
fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp'
Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
---
fs/nfsd/nfs4state.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 69e98ca..2903589 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1654,7 +1654,10 @@ nfs4_open_delegation(struct svc_fh *fh, struct
nfsd4_open *open, struct nfs4_sta
struct nfs4_delegation *dp;
struct nfs4_stateowner *sop = stp->st_stateowner;
struct nfs4_callback *cb = &sop->so_client->cl_callback;
- struct file_lock fl, *flp = &fl;
+ struct file_lock fl;
+#ifdef CONFIG_FILE_LOCKING
+ struct file_lock *flp = &fl;
+#endif
int status, flag = 0;
flag = NFS4_OPEN_DELEGATE_NONE;
--
1.5.4.3
Thanks -
Manish
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <ea11fea30901272238t4d11ba15t8bac4cd702ea7440-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c [not found] ` <ea11fea30901272238t4d11ba15t8bac4cd702ea7440-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2009-01-28 19:11 ` J. Bruce Fields 2009-01-28 22:05 ` Chuck Lever 0 siblings, 1 reply; 6+ messages in thread From: J. Bruce Fields @ 2009-01-28 19:11 UTC (permalink / raw) To: Manish Katiyar; +Cc: kmsmith, kandros, linux-nfs, akpm On Wed, Jan 28, 2009 at 12:08:19PM +0530, Manish Katiyar wrote: > Below patch removes the following warning ;- > fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp' I don't believe we want to support a .config with NFS or NFSD turned on but CONFIG_FILE_LOCKING off. --b. > > > Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> > --- > fs/nfsd/nfs4state.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 69e98ca..2903589 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -1654,7 +1654,10 @@ nfs4_open_delegation(struct svc_fh *fh, struct > nfsd4_open *open, struct nfs4_sta > struct nfs4_delegation *dp; > struct nfs4_stateowner *sop = stp->st_stateowner; > struct nfs4_callback *cb = &sop->so_client->cl_callback; > - struct file_lock fl, *flp = &fl; > + struct file_lock fl; > +#ifdef CONFIG_FILE_LOCKING > + struct file_lock *flp = &fl; > +#endif > int status, flag = 0; > > flag = NFS4_OPEN_DELEGATE_NONE; > -- > 1.5.4.3 > > > Thanks - > Manish > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c 2009-01-28 19:11 ` J. Bruce Fields @ 2009-01-28 22:05 ` Chuck Lever 2009-01-28 23:01 ` J. Bruce Fields 0 siblings, 1 reply; 6+ messages in thread From: Chuck Lever @ 2009-01-28 22:05 UTC (permalink / raw) To: J. Bruce Fields; +Cc: Manish Katiyar, kmsmith, kandros, linux-nfs, akpm On Jan 28, 2009, at Jan 28, 2009, 2:11 PM, J. Bruce Fields wrote: > On Wed, Jan 28, 2009 at 12:08:19PM +0530, Manish Katiyar wrote: >> Below patch removes the following warning ;- >> fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp' > > I don't believe we want to support a .config with NFS or NFSD turned > on > but CONFIG_FILE_LOCKING off. In that case, would we want to add a "depends on FILE_LOCKING" to both CONFIG_NFS and CONFIG_NFSD? > --b. > >> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> >> --- >> fs/nfsd/nfs4state.c | 5 ++++- >> 1 files changed, 4 insertions(+), 1 deletions(-) >> >> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c >> index 69e98ca..2903589 100644 >> --- a/fs/nfsd/nfs4state.c >> +++ b/fs/nfsd/nfs4state.c >> @@ -1654,7 +1654,10 @@ nfs4_open_delegation(struct svc_fh *fh, struct >> nfsd4_open *open, struct nfs4_sta >> struct nfs4_delegation *dp; >> struct nfs4_stateowner *sop = stp->st_stateowner; >> struct nfs4_callback *cb = &sop->so_client->cl_callback; >> - struct file_lock fl, *flp = &fl; >> + struct file_lock fl; >> +#ifdef CONFIG_FILE_LOCKING >> + struct file_lock *flp = &fl; >> +#endif >> int status, flag = 0; >> >> flag = NFS4_OPEN_DELEGATE_NONE; -- Chuck Lever chuck[dot]lever[at]oracle[dot]com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c 2009-01-28 22:05 ` Chuck Lever @ 2009-01-28 23:01 ` J. Bruce Fields 2009-01-29 3:05 ` Manish Katiyar 2009-01-29 3:53 ` Manish Katiyar 0 siblings, 2 replies; 6+ messages in thread From: J. Bruce Fields @ 2009-01-28 23:01 UTC (permalink / raw) To: Chuck Lever; +Cc: Manish Katiyar, kmsmith, kandros, linux-nfs, akpm On Wed, Jan 28, 2009 at 05:05:44PM -0500, Chuck Lever wrote: > On Jan 28, 2009, at Jan 28, 2009, 2:11 PM, J. Bruce Fields wrote: >> On Wed, Jan 28, 2009 at 12:08:19PM +0530, Manish Katiyar wrote: >>> Below patch removes the following warning ;- >>> fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp' >> >> I don't believe we want to support a .config with NFS or NFSD turned >> on >> but CONFIG_FILE_LOCKING off. > > In that case, would we want to add a "depends on FILE_LOCKING" to both > CONFIG_NFS and CONFIG_NFSD? Could be. --b. > >> --b. >> >>> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> >>> --- >>> fs/nfsd/nfs4state.c | 5 ++++- >>> 1 files changed, 4 insertions(+), 1 deletions(-) >>> >>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c >>> index 69e98ca..2903589 100644 >>> --- a/fs/nfsd/nfs4state.c >>> +++ b/fs/nfsd/nfs4state.c >>> @@ -1654,7 +1654,10 @@ nfs4_open_delegation(struct svc_fh *fh, struct >>> nfsd4_open *open, struct nfs4_sta >>> struct nfs4_delegation *dp; >>> struct nfs4_stateowner *sop = stp->st_stateowner; >>> struct nfs4_callback *cb = &sop->so_client->cl_callback; >>> - struct file_lock fl, *flp = &fl; >>> + struct file_lock fl; >>> +#ifdef CONFIG_FILE_LOCKING >>> + struct file_lock *flp = &fl; >>> +#endif >>> int status, flag = 0; >>> >>> flag = NFS4_OPEN_DELEGATE_NONE; > > -- > Chuck Lever > chuck[dot]lever[at]oracle[dot]com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c 2009-01-28 23:01 ` J. Bruce Fields @ 2009-01-29 3:05 ` Manish Katiyar 2009-01-29 3:53 ` Manish Katiyar 1 sibling, 0 replies; 6+ messages in thread From: Manish Katiyar @ 2009-01-29 3:05 UTC (permalink / raw) To: J. Bruce Fields; +Cc: Chuck Lever, kmsmith, kandros, linux-nfs, akpm On Thu, Jan 29, 2009 at 4:31 AM, J. Bruce Fields <bfields@fieldses.org> wrote: > On Wed, Jan 28, 2009 at 05:05:44PM -0500, Chuck Lever wrote: >> On Jan 28, 2009, at Jan 28, 2009, 2:11 PM, J. Bruce Fields wrote: >>> On Wed, Jan 28, 2009 at 12:08:19PM +0530, Manish Katiyar wrote: >>>> Below patch removes the following warning ;- >>>> fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp' >>> >>> I don't believe we want to support a .config with NFS or NFSD turned >>> on >>> but CONFIG_FILE_LOCKING off. >> >> In that case, would we want to add a "depends on FILE_LOCKING" to both >> CONFIG_NFS and CONFIG_NFSD? > > Could be. Yes...that would be a better option. I will rework the changes and send an updated patch. Thanks - Manish > > --b. > >> >>> --b. >>> >>>> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> >>>> --- >>>> fs/nfsd/nfs4state.c | 5 ++++- >>>> 1 files changed, 4 insertions(+), 1 deletions(-) >>>> >>>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c >>>> index 69e98ca..2903589 100644 >>>> --- a/fs/nfsd/nfs4state.c >>>> +++ b/fs/nfsd/nfs4state.c >>>> @@ -1654,7 +1654,10 @@ nfs4_open_delegation(struct svc_fh *fh, struct >>>> nfsd4_open *open, struct nfs4_sta >>>> struct nfs4_delegation *dp; >>>> struct nfs4_stateowner *sop = stp->st_stateowner; >>>> struct nfs4_callback *cb = &sop->so_client->cl_callback; >>>> - struct file_lock fl, *flp = &fl; >>>> + struct file_lock fl; >>>> +#ifdef CONFIG_FILE_LOCKING >>>> + struct file_lock *flp = &fl; >>>> +#endif >>>> int status, flag = 0; >>>> >>>> flag = NFS4_OPEN_DELEGATE_NONE; >> >> -- >> Chuck Lever >> chuck[dot]lever[at]oracle[dot]com > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c 2009-01-28 23:01 ` J. Bruce Fields 2009-01-29 3:05 ` Manish Katiyar @ 2009-01-29 3:53 ` Manish Katiyar 1 sibling, 0 replies; 6+ messages in thread From: Manish Katiyar @ 2009-01-29 3:53 UTC (permalink / raw) To: J. Bruce Fields; +Cc: Chuck Lever, kandros, linux-nfs, akpm On Thu, Jan 29, 2009 at 4:31 AM, J. Bruce Fields <bfields@fieldses.org> wrote: > On Wed, Jan 28, 2009 at 05:05:44PM -0500, Chuck Lever wrote: >> On Jan 28, 2009, at Jan 28, 2009, 2:11 PM, J. Bruce Fields wrote: >>> On Wed, Jan 28, 2009 at 12:08:19PM +0530, Manish Katiyar wrote: >>>> Below patch removes the following warning ;- >>>> fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp' >>> >>> I don't believe we want to support a .config with NFS or NFSD turned >>> on >>> but CONFIG_FILE_LOCKING off. >> >> In that case, would we want to add a "depends on FILE_LOCKING" to both >> CONFIG_NFS and CONFIG_NFSD? > > Could be. Enable NFS_FS and NFSD only when FILE_LOCKING is enabled. Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> --- fs/Kconfig | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index c680dcd..daaca7a 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1205,6 +1205,7 @@ if NETWORK_FILESYSTEMS config NFS_FS tristate "NFS client support" depends on INET + depends on FILE_LOCKING select LOCKD select SUNRPC select NFS_ACL_SUPPORT if NFS_V3_ACL @@ -1301,6 +1302,7 @@ config NFS_FSCACHE config NFSD tristate "NFS server support" depends on INET + depends on FILE_LOCKING select LOCKD select SUNRPC select EXPORTFS -- 1.5.4.3 Thanks - Manish > > --b. > >> >>> --b. >>> >>>> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com> >>>> --- >>>> fs/nfsd/nfs4state.c | 5 ++++- >>>> 1 files changed, 4 insertions(+), 1 deletions(-) >>>> >>>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c >>>> index 69e98ca..2903589 100644 >>>> --- a/fs/nfsd/nfs4state.c >>>> +++ b/fs/nfsd/nfs4state.c >>>> @@ -1654,7 +1654,10 @@ nfs4_open_delegation(struct svc_fh *fh, struct >>>> nfsd4_open *open, struct nfs4_sta >>>> struct nfs4_delegation *dp; >>>> struct nfs4_stateowner *sop = stp->st_stateowner; >>>> struct nfs4_callback *cb = &sop->so_client->cl_callback; >>>> - struct file_lock fl, *flp = &fl; >>>> + struct file_lock fl; >>>> +#ifdef CONFIG_FILE_LOCKING >>>> + struct file_lock *flp = &fl; >>>> +#endif >>>> int status, flag = 0; >>>> >>>> flag = NFS4_OPEN_DELEGATE_NONE; >> >> -- >> Chuck Lever >> chuck[dot]lever[at]oracle[dot]com > ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-01-29 3:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-28 6:38 [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c Manish Katiyar
[not found] ` <ea11fea30901272238t4d11ba15t8bac4cd702ea7440-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-28 19:11 ` J. Bruce Fields
2009-01-28 22:05 ` Chuck Lever
2009-01-28 23:01 ` J. Bruce Fields
2009-01-29 3:05 ` Manish Katiyar
2009-01-29 3:53 ` Manish Katiyar
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.