2 files changed, 10 insertions, 12 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;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 1bdbd4f9fdd2..8f71e766cc5d 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -734,14 +734,14 @@ int nfs_updatepage(struct file *file, struct page *page,
                 unsigned int offset, unsigned int count)
 {
         struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data;
-        struct dentry   *dentry = file->f_dentry;
         struct inode    *inode = page->mapping->host;
         struct nfs_page *req;
         int             status = 0;
 
         dprintk("NFS:      nfs_updatepage(%s/%s %d@%Ld)\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name,
-                count, (long long)(page_offset(page) +offset));
+                file->f_dentry->d_parent->d_name.name,
+                file->f_dentry->d_name.name, count,
+                (long long)(page_offset(page) +offset));
 
         if (IS_SYNC(inode)) {
                 status = nfs_writepage_sync(ctx, inode, page, offset, count, 0);
@@ -850,7 +850,6 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
                 unsigned int count, unsigned int offset,
                 int how)
 {
-        struct rpc_task         *task = &data->task;
         struct inode            *inode;
 
         /* Set up the RPC argument and reply structs
@@ -881,7 +880,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
         data->task.tk_release = nfs_writedata_release;
 
         dprintk("NFS: %4d initiated write call (req %s/%Ld, %u bytes @ offset %Lu)\n",
-                task->tk_pid,
+                data->task.tk_pid,
                 inode->i_sb->s_id,
                 (long long)NFS_FILEID(inode),
                 count,
@@ -1217,7 +1216,6 @@ static void nfs_commit_release(struct rpc_task *task)
 static void nfs_commit_rpcsetup(struct list_head *head,
                 struct nfs_write_data *data, int how)
 {
-        struct rpc_task         *task = &data->task;
         struct nfs_page         *first;
         struct inode            *inode;
 
@@ -1248,7 +1246,7 @@ static void nfs_commit_rpcsetup(struct list_head *head,
         /* Release requests */
         data->task.tk_release = nfs_commit_release;
         
-        dprintk("NFS: %4d initiated commit call\n", task->tk_pid);
+        dprintk("NFS: %4d initiated commit call\n", data->task.tk_pid);
 }
 
 /*