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>
This commit is contained in:
parent
0d424ad0a4
commit
f7a40689fd
|
@ -107,8 +107,8 @@ extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time,
|
||||||
|
|
||||||
extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode,
|
extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode,
|
||||||
__u16 fileHandle, struct file *file,
|
__u16 fileHandle, struct file *file,
|
||||||
struct vfsmount *mnt, unsigned int oflags,
|
struct vfsmount *mnt, struct cifsTconInfo *tcon,
|
||||||
__u32 oplock);
|
unsigned int oflags, __u32 oplock);
|
||||||
extern int cifs_posix_open(char *full_path, struct inode **pinode,
|
extern int cifs_posix_open(char *full_path, struct inode **pinode,
|
||||||
struct super_block *sb,
|
struct super_block *sb,
|
||||||
int mode, int oflags,
|
int mode, int oflags,
|
||||||
|
|
|
@ -131,9 +131,9 @@ cifs_bp_rename_retry:
|
||||||
}
|
}
|
||||||
|
|
||||||
struct cifsFileInfo *
|
struct cifsFileInfo *
|
||||||
cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle,
|
cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file,
|
||||||
struct file *file, struct vfsmount *mnt, unsigned int oflags,
|
struct vfsmount *mnt, struct cifsTconInfo *tcon,
|
||||||
__u32 oplock)
|
unsigned int oflags, __u32 oplock)
|
||||||
{
|
{
|
||||||
struct cifsFileInfo *pCifsFile;
|
struct cifsFileInfo *pCifsFile;
|
||||||
struct cifsInodeInfo *pCifsInode;
|
struct cifsInodeInfo *pCifsInode;
|
||||||
|
@ -150,7 +150,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle,
|
||||||
pCifsFile->pfile = file;
|
pCifsFile->pfile = file;
|
||||||
pCifsFile->invalidHandle = false;
|
pCifsFile->invalidHandle = false;
|
||||||
pCifsFile->closePend = false;
|
pCifsFile->closePend = false;
|
||||||
pCifsFile->tcon = cifs_sb_tcon(cifs_sb);
|
pCifsFile->tcon = tcon;
|
||||||
mutex_init(&pCifsFile->fh_mutex);
|
mutex_init(&pCifsFile->fh_mutex);
|
||||||
mutex_init(&pCifsFile->lock_mutex);
|
mutex_init(&pCifsFile->lock_mutex);
|
||||||
INIT_LIST_HEAD(&pCifsFile->llist);
|
INIT_LIST_HEAD(&pCifsFile->llist);
|
||||||
|
@ -158,7 +158,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle,
|
||||||
INIT_WORK(&pCifsFile->oplock_break, cifs_oplock_break);
|
INIT_WORK(&pCifsFile->oplock_break, cifs_oplock_break);
|
||||||
|
|
||||||
write_lock(&GlobalSMBSeslock);
|
write_lock(&GlobalSMBSeslock);
|
||||||
list_add(&pCifsFile->tlist, &cifs_sb_tcon(cifs_sb)->openFileList);
|
list_add(&pCifsFile->tlist, &tcon->openFileList);
|
||||||
pCifsInode = CIFS_I(newinode);
|
pCifsInode = CIFS_I(newinode);
|
||||||
if (pCifsInode) {
|
if (pCifsInode) {
|
||||||
/* if readable file instance put first in list*/
|
/* if readable file instance put first in list*/
|
||||||
|
@ -191,6 +191,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
|
||||||
__u32 posix_flags = 0;
|
__u32 posix_flags = 0;
|
||||||
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
||||||
struct cifs_fattr fattr;
|
struct cifs_fattr fattr;
|
||||||
|
struct cifsTconInfo *tcon = cifs_sb_tcon(cifs_sb);
|
||||||
|
|
||||||
cFYI(1, "posix open %s", full_path);
|
cFYI(1, "posix open %s", full_path);
|
||||||
|
|
||||||
|
@ -225,9 +226,9 @@ int cifs_posix_open(char *full_path, struct inode **pinode,
|
||||||
posix_flags |= SMB_O_DIRECT;
|
posix_flags |= SMB_O_DIRECT;
|
||||||
|
|
||||||
mode &= ~current_umask();
|
mode &= ~current_umask();
|
||||||
rc = CIFSPOSIXCreate(xid, cifs_sb_tcon(cifs_sb), posix_flags, mode,
|
rc = CIFSPOSIXCreate(xid, tcon, posix_flags, mode, pnetfid, presp_data,
|
||||||
pnetfid, presp_data, poplock, full_path,
|
poplock, full_path, cifs_sb->local_nls,
|
||||||
cifs_sb->local_nls, cifs_sb->mnt_cifs_flags &
|
cifs_sb->mnt_cifs_flags &
|
||||||
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
CIFS_MOUNT_MAP_SPECIAL_CHR);
|
||||||
if (rc)
|
if (rc)
|
||||||
goto posix_open_ret;
|
goto posix_open_ret;
|
||||||
|
@ -466,7 +467,8 @@ cifs_create_set_dentry:
|
||||||
}
|
}
|
||||||
|
|
||||||
pfile_info = cifs_new_fileinfo(newinode, fileHandle, filp,
|
pfile_info = cifs_new_fileinfo(newinode, fileHandle, filp,
|
||||||
nd->path.mnt, oflags, oplock);
|
nd->path.mnt, tcon, oflags,
|
||||||
|
oplock);
|
||||||
if (pfile_info == NULL) {
|
if (pfile_info == NULL) {
|
||||||
fput(filp);
|
fput(filp);
|
||||||
CIFSSMBClose(xid, tcon, fileHandle);
|
CIFSSMBClose(xid, tcon, fileHandle);
|
||||||
|
@ -726,7 +728,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
|
||||||
}
|
}
|
||||||
|
|
||||||
cfile = cifs_new_fileinfo(newInode, fileHandle, filp,
|
cfile = cifs_new_fileinfo(newInode, fileHandle, filp,
|
||||||
nd->path.mnt,
|
nd->path.mnt, pTcon,
|
||||||
nd->intent.open.flags,
|
nd->intent.open.flags,
|
||||||
oplock);
|
oplock);
|
||||||
if (cfile == NULL) {
|
if (cfile == NULL) {
|
||||||
|
|
|
@ -277,7 +277,7 @@ int cifs_open(struct inode *inode, struct file *file)
|
||||||
|
|
||||||
pCifsFile = cifs_new_fileinfo(inode, netfid, file,
|
pCifsFile = cifs_new_fileinfo(inode, netfid, file,
|
||||||
file->f_path.mnt,
|
file->f_path.mnt,
|
||||||
oflags, oplock);
|
tcon, oflags, oplock);
|
||||||
if (pCifsFile == NULL) {
|
if (pCifsFile == NULL) {
|
||||||
CIFSSMBClose(xid, tcon, netfid);
|
CIFSSMBClose(xid, tcon, netfid);
|
||||||
rc = -ENOMEM;
|
rc = -ENOMEM;
|
||||||
|
@ -370,7 +370,7 @@ int cifs_open(struct inode *inode, struct file *file)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
pCifsFile = cifs_new_fileinfo(inode, netfid, file, file->f_path.mnt,
|
pCifsFile = cifs_new_fileinfo(inode, netfid, file, file->f_path.mnt,
|
||||||
file->f_flags, oplock);
|
tcon, file->f_flags, oplock);
|
||||||
if (pCifsFile == NULL) {
|
if (pCifsFile == NULL) {
|
||||||
rc = -ENOMEM;
|
rc = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in a new issue