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