NFS,SUNRPC,NLM: fix unused variable warnings when CONFIG_SYSCTL is disabled

 Fix some dprintk's so that NLM, NFS client, and RPC client compile
 cleanly if CONFIG_SYSCTL is disabled.

 Test plan:
 Compile kernel with CONFIG_NFS enabled and CONFIG_SYSCTL disabled.

 Signed-off-by: Chuck Lever <cel@netapp.com>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 6537f2c4ae44..b497c71384e8 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -655,7 +655,6 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
         struct file *file = iocb->ki_filp;
         struct nfs_open_context *ctx =
                         (struct nfs_open_context *) file->private_data;
-        struct dentry *dentry = file->f_dentry;
         struct address_space *mapping = file->f_mapping;
         struct inode *inode = mapping->host;
         struct iovec iov = {
@@ -664,7 +663,8 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t
         };
 
         dprintk("nfs: direct read(%s/%s, %lu@%lu)\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name,
+                file->f_dentry->d_parent->d_name.name,
+                file->f_dentry->d_name.name,
                 (unsigned long) count, (unsigned long) pos);
 
         if (!is_sync_kiocb(iocb))
@@ -730,7 +730,6 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
         struct file *file = iocb->ki_filp;
         struct nfs_open_context *ctx =
                         (struct nfs_open_context *) file->private_data;
-        struct dentry *dentry = file->f_dentry;
         struct address_space *mapping = file->f_mapping;
         struct inode *inode = mapping->host;
         struct iovec iov = {
@@ -739,8 +738,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count,
         };
 
         dfprintk(VFS, "nfs: direct write(%s/%s(%ld), %lu@%lu)\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name,
-                inode->i_ino, (unsigned long) count, (unsigned long) pos);
+                file->f_dentry->d_parent->d_name.name,
+                file->f_dentry->d_name.name, inode->i_ino,
+                (unsigned long) count, (unsigned long) pos);
 
         if (!is_sync_kiocb(iocb))
                 goto out;