1 files changed, 33 insertions, 41 deletions

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 4326ffd90fa9..1f42f772865a 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -24,6 +24,7 @@
 #include <linux/stat.h>
 #include <linux/slab.h>
 #include <linux/namei.h>
+#include <linux/mount.h>
 #include "cifsfs.h"
 #include "cifspdu.h"
 #include "cifsglob.h"
@@ -129,44 +130,45 @@ cifs_bp_rename_retry:
         return full_path;
 }
 
-static void
-cifs_fill_fileinfo(struct inode *newinode, __u16 fileHandle,
-                        struct cifsTconInfo *tcon, bool write_only)
+struct cifsFileInfo *
+cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle,
+                  struct file *file, struct vfsmount *mnt, unsigned int oflags)
 {
         int oplock = 0;
         struct cifsFileInfo *pCifsFile;
         struct cifsInodeInfo *pCifsInode;
+        struct cifs_sb_info *cifs_sb = CIFS_SB(mnt->mnt_sb);
 
         pCifsFile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
-
         if (pCifsFile == NULL)
-                return;
+                return pCifsFile;
 
         if (oplockEnabled)
                 oplock = REQ_OPLOCK;
 
         pCifsFile->netfid = fileHandle;
         pCifsFile->pid = current->tgid;
-        pCifsFile->pInode = newinode;
+        pCifsFile->pInode = igrab(newinode);
+        pCifsFile->mnt = mnt;
+        pCifsFile->pfile = file;
         pCifsFile->invalidHandle = false;
         pCifsFile->closePend = false;
         mutex_init(&pCifsFile->fh_mutex);
         mutex_init(&pCifsFile->lock_mutex);
         INIT_LIST_HEAD(&pCifsFile->llist);
-        atomic_set(&pCifsFile->wrtPending, 0);
+        atomic_set(&pCifsFile->count, 1);
+        slow_work_init(&pCifsFile->oplock_break, &cifs_oplock_break_ops);
 
-        /* set the following in open now
-                        pCifsFile->pfile = file; */
         write_lock(&GlobalSMBSeslock);
-        list_add(&pCifsFile->tlist, &tcon->openFileList);
+        list_add(&pCifsFile->tlist, &cifs_sb->tcon->openFileList);
         pCifsInode = CIFS_I(newinode);
         if (pCifsInode) {
                 /* if readable file instance put first in list*/
-                if (write_only)
+                if (oflags & FMODE_READ)
+                        list_add(&pCifsFile->flist, &pCifsInode->openFileList);
+                else
                         list_add_tail(&pCifsFile->flist,
                                       &pCifsInode->openFileList);
-                else
-                        list_add(&pCifsFile->flist, &pCifsInode->openFileList);
 
                 if ((oplock & 0xF) == OPLOCK_EXCLUSIVE) {
                         pCifsInode->clientCanCacheAll = true;
@@ -176,18 +178,18 @@ cifs_fill_fileinfo(struct inode *newinode, __u16 fileHandle,
                                 pCifsInode->clientCanCacheRead = true;
         }
         write_unlock(&GlobalSMBSeslock);
+
+        return pCifsFile;
 }
 
 int cifs_posix_open(char *full_path, struct inode **pinode,
-                    struct super_block *sb, int mode, int oflags,
-                    int *poplock, __u16 *pnetfid, int xid)
+                    struct vfsmount *mnt, int mode, int oflags,
+                    __u32 *poplock, __u16 *pnetfid, int xid)
 {
         int rc;
-        __u32 oplock;
-        bool write_only = false;
         FILE_UNIX_BASIC_INFO *presp_data;
         __u32 posix_flags = 0;
-        struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+        struct cifs_sb_info *cifs_sb = CIFS_SB(mnt->mnt_sb);
         struct cifs_fattr fattr;
 
         cFYI(1, ("posix open %s", full_path));
@@ -212,8 +214,6 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
                 posix_flags |= SMB_O_EXCL;
         if (oflags & O_TRUNC)
                 posix_flags |= SMB_O_TRUNC;
-        if (oflags & O_APPEND)
-                posix_flags |= SMB_O_APPEND;
         if (oflags & O_SYNC)
                 posix_flags |= SMB_O_SYNC;
         if (oflags & O_DIRECTORY)
@@ -223,12 +223,9 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
         if (oflags & O_DIRECT)
                 posix_flags |= SMB_O_DIRECT;
 
-        if (!(oflags & FMODE_READ))
-                write_only = true;
-
         mode &= ~current_umask();
         rc = CIFSPOSIXCreate(xid, cifs_sb->tcon, posix_flags, mode,
-                        pnetfid, presp_data, &oplock, full_path,
+                        pnetfid, presp_data, poplock, full_path,
                         cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
                                         CIFS_MOUNT_MAP_SPECIAL_CHR);
         if (rc)
@@ -244,7 +241,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
 
         /* get new inode and set it up */
         if (*pinode == NULL) {
-                *pinode = cifs_iget(sb, &fattr);
+                *pinode = cifs_iget(mnt->mnt_sb, &fattr);
                 if (!*pinode) {
                         rc = -ENOMEM;
                         goto posix_open_ret;
@@ -253,7 +250,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
                 cifs_fattr_to_inode(*pinode, &fattr);
         }
 
-        cifs_fill_fileinfo(*pinode, *pnetfid, cifs_sb->tcon, write_only);
+        cifs_new_fileinfo(*pinode, *pnetfid, NULL, mnt, oflags);
 
 posix_open_ret:
         kfree(presp_data);
@@ -280,7 +277,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
         int rc = -ENOENT;
         int xid;
         int create_options = CREATE_NOT_DIR;
-        int oplock = 0;
+        __u32 oplock = 0;
         int oflags;
         bool posix_create = false;
         /*
@@ -298,7 +295,6 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
         FILE_ALL_INFO *buf = NULL;
         struct inode *newinode = NULL;
         int disposition = FILE_OVERWRITE_IF;
-        bool write_only = false;
 
         xid = GetXid();
 
@@ -323,7 +319,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
         if (tcon->unix_ext && (tcon->ses->capabilities & CAP_UNIX) &&
             (CIFS_UNIX_POSIX_PATH_OPS_CAP &
                         le64_to_cpu(tcon->fsUnixInfo.Capability))) {
-                rc = cifs_posix_open(full_path, &newinode, inode->i_sb,
+                rc = cifs_posix_open(full_path, &newinode, nd->path.mnt,
                                      mode, oflags, &oplock, &fileHandle, xid);
                 /* EIO could indicate that (posix open) operation is not
                    supported, despite what server claimed in capability
@@ -351,11 +347,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                 desiredAccess = 0;
                 if (oflags & FMODE_READ)
                         desiredAccess |= GENERIC_READ; /* is this too little? */
-                if (oflags & FMODE_WRITE) {
+                if (oflags & FMODE_WRITE)
                         desiredAccess |= GENERIC_WRITE;
-                        if (!(oflags & FMODE_READ))
-                                write_only = true;
-                }
 
                 if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
                         disposition = FILE_CREATE;
@@ -470,8 +463,8 @@ cifs_create_set_dentry:
                 /* mknod case - do not leave file open */
                 CIFSSMBClose(xid, tcon, fileHandle);
         } else if (!(posix_create) && (newinode)) {
-                        cifs_fill_fileinfo(newinode, fileHandle,
-                                        cifs_sb->tcon, write_only);
+                        cifs_new_fileinfo(newinode, fileHandle, NULL,
+                                                nd->path.mnt, oflags);
         }
 cifs_create_out:
         kfree(buf);
@@ -611,7 +604,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 {
         int xid;
         int rc = 0; /* to get around spurious gcc warning, set to zero here */
-        int oplock = 0;
+        __u32 oplock = 0;
         __u16 fileHandle = 0;
         bool posix_open = false;
         struct cifs_sb_info *cifs_sb;
@@ -648,9 +641,9 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
          * O_EXCL: optimize away the lookup, but don't hash the dentry. Let
          * the VFS handle the create.
          */
-        if (nd->flags & LOOKUP_EXCL) {
+        if (nd && (nd->flags & LOOKUP_EXCL)) {
                 d_instantiate(direntry, NULL);
-                return 0;
+                return NULL;
         }
 
         /* can not grab the rename sem here since it would
@@ -680,11 +673,10 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
          * reduction in network traffic in the other paths.
          */
         if (pTcon->unix_ext) {
-                if (!(nd->flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY)) &&
+                if (nd && !(nd->flags & (LOOKUP_PARENT | LOOKUP_DIRECTORY)) &&
                      (nd->flags & LOOKUP_OPEN) && !pTcon->broken_posix_open &&
                      (nd->intent.open.flags & O_CREAT)) {
-                        rc = cifs_posix_open(full_path, &newInode,
-                                        parent_dir_inode->i_sb,
+                        rc = cifs_posix_open(full_path, &newInode, nd->path.mnt,
                                         nd->intent.open.create_mode,
                                         nd->intent.open.flags, &oplock,
                                         &fileHandle, xid);