cifs: eliminate oflags option from cifs_new_fileinfo

Eliminate the poor, misunderstood "oflags" option from cifs_new_fileinfo.
The callers mostly pass in the filp->f_flags here.

That's not correct however since we're checking that value for
the presence of FMODE_READ. Luckily that only affects how the f_list is
ordered. What it really wants here is the file->f_mode. Just use that
field from the filp to determine it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 4f7edbaf0118a46c62e92bffc3f319b74a9834d5..781676e9cfc38533e285660fed48070cd97a5a7e 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -107,8 +107,7 @@ extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time,
 
 extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode,
                                __u16 fileHandle, struct file *file,
-                               struct tcon_link *tlink,
-                               unsigned int oflags, __u32 oplock);
+                               struct tcon_link *tlink, __u32 oplock);
 extern int cifs_posix_open(char *full_path, struct inode **pinode,
                                struct super_block *sb,
                                int mode, unsigned int f_flags,

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 8c1af7128384492bd6f74e1efd83c948e482cb79..ce1fa3027b2303f2f7f36857950c7b4db13ee1c3 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -132,7 +132,7 @@ cifs_bp_rename_retry:
 
 struct cifsFileInfo *
 cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file,
-                 struct tcon_link *tlink, unsigned int oflags, __u32 oplock)
+                 struct tcon_link *tlink, __u32 oplock)
 {
        struct dentry *dentry = file->f_path.dentry;
        struct cifsFileInfo *pCifsFile;
@@ -161,7 +161,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file,
        pCifsInode = CIFS_I(newinode);
        if (pCifsInode) {
                /* if readable file instance put first in list*/
-               if (oflags & FMODE_READ)
+               if (file->f_mode & FMODE_READ)
                        list_add(&pCifsFile->flist, &pCifsInode->openFileList);
                else
                        list_add_tail(&pCifsFile->flist,
@@ -396,7 +396,7 @@ cifs_create_set_dentry:
                }
 
                pfile_info = cifs_new_fileinfo(newinode, fileHandle, filp,
-                                               tlink, oflags, oplock);
+                                               tlink, oplock);
                if (pfile_info == NULL) {
                        fput(filp);
                        CIFSSMBClose(xid, tcon, fileHandle);
@@ -670,8 +670,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
                        }
 
                        cfile = cifs_new_fileinfo(newInode, fileHandle, filp,
-                                                 tlink, nd->intent.open.flags,
-                                                 oplock);
+                                                 tlink, oplock);
                        if (cfile == NULL) {
                                fput(filp);
                                CIFSSMBClose(xid, pTcon, fileHandle);

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index b1ca6a43ac1a3fd399f47abe7f9d63ec0f34ac39..774e3ac1208bc43c154063cbfd7e7e233cdf0139 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -273,7 +273,7 @@ int cifs_open(struct inode *inode, struct file *file)
                        cFYI(1, "posix open succeeded");
 
                        pCifsFile = cifs_new_fileinfo(inode, netfid, file,
-                                                       tlink, oflags, oplock);
+                                                       tlink, oplock);
                        if (pCifsFile == NULL) {
                                CIFSSMBClose(xid, tcon, netfid);
                                rc = -ENOMEM;
@@ -365,8 +365,7 @@ int cifs_open(struct inode *inode, struct file *file)
        if (rc != 0)
                goto out;
 
-       pCifsFile = cifs_new_fileinfo(inode, netfid, file, tlink,
-                                       file->f_flags, oplock);
+       pCifsFile = cifs_new_fileinfo(inode, netfid, file, tlink, oplock);
        if (pCifsFile == NULL) {
                rc = -ENOMEM;
                goto out;