diff options
| author |   Jeff Layton <jlayton@redhat.com> | 2010-09-20 16:01:36 -0700 |
|---|---|---|
| committer |   Steve French <sfrench@us.ibm.com> | 2010-09-29 19:04:33 +0000 |
| commit | f7a40689fd1e963cb1006349e050c07584895db5 (patch) | |
| tree | 32c0275bde5c7c2a9cb36c672648bb19e392171f /fs/cifs/file.c | |
| parent | cifs: add cifs_sb_master_tcon and convert some callers to use it (diff) | |
| download | linux-dev-f7a40689fd1e963cb1006349e050c07584895db5.tar.xz linux-dev-f7a40689fd1e963cb1006349e050c07584895db5.zip | |
cifs: have cifs_new_fileinfo take a tcon arg
To minimize calls to cifs_sb_tcon and to allow for a clear error path if
a tcon can't be acquired.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/file.c')
| -rw-r--r-- | fs/cifs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 6712c2b0a0ae..e5f463e15c9b 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -277,7 +277,7 @@ int cifs_open(struct inode *inode, struct file *file) pCifsFile = cifs_new_fileinfo(inode, netfid, file, file->f_path.mnt, - oflags, oplock); + tcon, oflags, oplock); if (pCifsFile == NULL) { CIFSSMBClose(xid, tcon, netfid); rc = -ENOMEM; @@ -370,7 +370,7 @@ int cifs_open(struct inode *inode, struct file *file) goto out; pCifsFile = cifs_new_fileinfo(inode, netfid, file, file->f_path.mnt, - file->f_flags, oplock); + tcon, file->f_flags, oplock); if (pCifsFile == NULL) { rc = -ENOMEM; goto out; |