[PATCH] : Fix compilation warnings when CONFIG_FILE_LOCKING is not defined.

[PATCH] : Fix compilation warnings when CONFIG_FILE_LOCKING is not defined.

[Manish Katiyar]

Below patch removes the following compilation warnings.

fs/lockd/svclock.c:719: warning: unused variable 'file'
fs/nfsd/nfsxdr.c:154: warning: unused variable 'dentry'


Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 6063a8e..c4a08e2 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -716,7 +716,9 @@ struct lock_manager_operations nlmsvc_lock_operations = {
 static void
 nlmsvc_grant_blocked(struct nlm_block *block)
 {
+#ifdef CONFIG_FILE_LOCKING
        struct nlm_file         *file = block->b_file;
+#endif
        struct nlm_lock         *lock = &block->b_call->a_args.lock;
        int                     error;

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index afd08e2..70219c9 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -151,7 +151,9 @@ static __be32 *
 encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
             struct kstat *stat)
 {
+#ifdef CONFIG_FILE_LOCKING
        struct dentry   *dentry = fhp->fh_dentry;
+#endif
        int type;
        struct timespec time;
        u32 f;


Thanks -
Manish