2009-01-28 06:38:21

by Manish Katiyar

Subject: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c

Below patch removes the following warning ;-
fs/nfsd/nfs4state.c:1657: warning: unused variable 'flp'


Signed-off-by: Manish Katiyar <[email protected]>
---
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

2009-01-28 19:11:06

by J. Bruce Fields

Subject: Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c

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 <[email protected]>
> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2009-01-28 22:06:15

by Chuck Lever

Subject: Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c

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 <[email protected]>
>> ---
>> 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

2009-01-28 23:01:48

by J. Bruce Fields

Subject: Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c

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 <[email protected]>
>>> ---
>>> 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

2009-01-29 03:05:45

by Manish Katiyar

Subject: Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c

On Thu, Jan 29, 2009 at 4:31 AM, J. Bruce Fields <[email protected]> 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 <[email protected]>
>>>> ---
>>>> 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
>

2009-01-29 03:53:29

by Manish Katiyar

Subject: Re: [PATCH] : Fix compilation warnings in fs/nfsd/nfs4state.c

On Thu, Jan 29, 2009 at 4:31 AM, J. Bruce Fields <[email protected]> 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 <[email protected]>
---
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 <[email protected]>
>>>> ---
>>>> 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
>