diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-10-15 21:33:57 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-18 02:34:35 +0200 |
| commit | f6a53460e2a105904deeada737b3f878d78517b3 (patch) | |
| tree | f51122e6e3e2a5d3a864d17cad708d313b0ef12a /fs/cifs/file.c | |
| parent | cifs: fix flags handling in cifs_posix_open (diff) | |
| download | linux-f6a53460e2a105904deeada737b3f878d78517b3.tar.xz linux-f6a53460e2a105904deeada737b3f878d78517b3.zip | |
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>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index b1ca6a43ac1a..774e3ac1208b 100644 --- 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; |