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>
This commit is contained in:

committed by
Steve French

orang tua
608712fe86
melakukan
f6a53460e2
@@ -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);
|
||||
|
Reference in New Issue
Block a user