cifs: eliminate pfile pointer from cifsFileInfo

All the remaining users of cifsFileInfo->pfile just use it to get
at the f_flags/f_mode. Now that we store that separately in the
cifsFileInfo, there's no need to consult the pfile at all from
a cifsFileInfo pointer.

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

3 files changed, 3 insertions, 10 deletions

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index b746dec88396..9f99afab9a04 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -388,7 +388,6 @@ struct cifsFileInfo {
         __u16 netfid;           /* file id from remote */
         /* BB add lock scope info here if needed */ ;
         /* lock scope id (0 if none) */
-        struct file *pfile; /* needed for writepage */
         struct dentry *dentry;
         unsigned int f_flags;
         struct tcon_link *tlink;
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 3c23d882a44c..600eac18cb21 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -148,7 +148,6 @@ cifs_new_fileinfo(__u16 fileHandle, struct file *file,
         pCifsFile->uid = current_fsuid();
         pCifsFile->dentry = dget(dentry);
         pCifsFile->f_flags = file->f_flags;
-        pCifsFile->pfile = file;
         pCifsFile->invalidHandle = false;
         pCifsFile->closePend = false;
         pCifsFile->tlink = cifs_get_tlink(tlink);
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index d5f3007364e3..7935816fa111 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1144,8 +1144,7 @@ struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode,
                         continue;
                 if (fsuid_only && open_file->uid != current_fsuid())
                         continue;
-                if (open_file->pfile && ((open_file->pfile->f_flags & O_RDWR) ||
-                    (open_file->pfile->f_flags & O_RDONLY))) {
+                if (OPEN_FMODE(open_file->f_flags) & FMODE_READ) {
                         if (!open_file->invalidHandle) {
                                 /* found a good file */
                                 /* lock it so it will not be closed on us */
@@ -1194,9 +1193,7 @@ refind_writable:
                         continue;
                 if (fsuid_only && open_file->uid != current_fsuid())
                         continue;
-                if (open_file->pfile &&
-                    ((open_file->pfile->f_flags & O_RDWR) ||
-                     (open_file->pfile->f_flags & O_WRONLY))) {
+                if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
                         cifsFileInfo_get(open_file);
 
                         if (!open_file->invalidHandle) {
@@ -2160,9 +2157,7 @@ static int is_inode_writable(struct cifsInodeInfo *cifs_inode)
         list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
                 if (open_file->closePend)
                         continue;
-                if (open_file->pfile &&
-                    ((open_file->pfile->f_flags & O_RDWR) ||
-                     (open_file->pfile->f_flags & O_WRONLY))) {
+                if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
                         read_unlock(&GlobalSMBSeslock);
                         return 1;
                 }