diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-10-15 15:33:57 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-10-17 20:34:35 -0400 |
commit | f6a53460e2a105904deeada737b3f878d78517b3 (patch) | |
tree | f51122e6e3e2a5d3a864d17cad708d313b0ef12a /fs/cifs/file.c | |
parent | 608712fe8609492a8670638ea86b97fafe49ebba (diff) |
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) | |||
273 | cFYI(1, "posix open succeeded"); | 273 | cFYI(1, "posix open succeeded"); |
274 | 274 | ||
275 | pCifsFile = cifs_new_fileinfo(inode, netfid, file, | 275 | pCifsFile = cifs_new_fileinfo(inode, netfid, file, |
276 | tlink, oflags, oplock); | 276 | tlink, oplock); |
277 | if (pCifsFile == NULL) { | 277 | if (pCifsFile == NULL) { |
278 | CIFSSMBClose(xid, tcon, netfid); | 278 | CIFSSMBClose(xid, tcon, netfid); |
279 | rc = -ENOMEM; | 279 | rc = -ENOMEM; |
@@ -365,8 +365,7 @@ int cifs_open(struct inode *inode, struct file *file) | |||
365 | if (rc != 0) | 365 | if (rc != 0) |
366 | goto out; | 366 | goto out; |
367 | 367 | ||
368 | pCifsFile = cifs_new_fileinfo(inode, netfid, file, tlink, | 368 | pCifsFile = cifs_new_fileinfo(inode, netfid, file, tlink, oplock); |
369 | file->f_flags, oplock); | ||
370 | if (pCifsFile == NULL) { | 369 | if (pCifsFile == NULL) { |
371 | rc = -ENOMEM; | 370 | rc = -ENOMEM; |
372 | goto out; | 371 | goto out; |