aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 3d8f8a96f5a3..058b390d3da8 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -31,6 +31,7 @@
31#include <linux/task_io_accounting_ops.h> 31#include <linux/task_io_accounting_ops.h>
32#include <linux/delay.h> 32#include <linux/delay.h>
33#include <linux/mount.h> 33#include <linux/mount.h>
34#include <linux/slab.h>
34#include <asm/div64.h> 35#include <asm/div64.h>
35#include "cifsfs.h" 36#include "cifsfs.h"
36#include "cifspdu.h" 37#include "cifspdu.h"
@@ -219,8 +220,8 @@ static inline int cifs_open_inode_helper(struct inode *inode, struct file *file,
219 cFYI(1, ("inode unchanged on server")); 220 cFYI(1, ("inode unchanged on server"));
220 } else { 221 } else {
221 if (file->f_path.dentry->d_inode->i_mapping) { 222 if (file->f_path.dentry->d_inode->i_mapping) {
222 /* BB no need to lock inode until after invalidate 223 /* BB no need to lock inode until after invalidate
223 since namei code should already have it locked? */ 224 since namei code should already have it locked? */
224 rc = filemap_write_and_wait(file->f_path.dentry->d_inode->i_mapping); 225 rc = filemap_write_and_wait(file->f_path.dentry->d_inode->i_mapping);
225 if (rc != 0) 226 if (rc != 0)
226 CIFS_I(file->f_path.dentry->d_inode)->write_behind_rc = rc; 227 CIFS_I(file->f_path.dentry->d_inode)->write_behind_rc = rc;
@@ -1890,11 +1891,10 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size,
1890 1891
1891int cifs_file_mmap(struct file *file, struct vm_area_struct *vma) 1892int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)
1892{ 1893{
1893 struct dentry *dentry = file->f_path.dentry;
1894 int rc, xid; 1894 int rc, xid;
1895 1895
1896 xid = GetXid(); 1896 xid = GetXid();
1897 rc = cifs_revalidate(dentry); 1897 rc = cifs_revalidate_file(file);
1898 if (rc) { 1898 if (rc) {
1899 cFYI(1, ("Validation prior to mmap failed, error=%d", rc)); 1899 cFYI(1, ("Validation prior to mmap failed, error=%d", rc));
1900 FreeXid(xid); 1900 FreeXid(xid);