Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13cfb733 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: have cifsFileInfo hold a reference to a tlink rather than tcon pointer 



cifsFileInfo needs a pointer to a tcon, but it doesn't currently hold a
reference to it. Change it to keep a pointer to a tcon_link instead and
hold a reference to it.

That will keep the tcon from being freed until the file is closed.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 7ffec372

fs/cifs/cifsfs.c

+2 −1
Original line number Diff line number Diff line
@@ -595,7 +595,8 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) 
	    ((arg == F_WRLCK) &&

		(CIFS_I(inode)->clientCanCacheAll)))

		return generic_setlease(file, arg, lease);

	else if (cfile->tcon->local_lease && !CIFS_I(inode)->clientCanCacheRead)

	else if (tlink_tcon(cfile->tlink)->local_lease &&

		 !CIFS_I(inode)->clientCanCacheRead)

		/* If the server claims to support oplock on this

		   file, then we still need to check oplock even

		   if the local_lease mount option is set, but there

fs/cifs/cifsglob.h

+8 −1
Original line number Diff line number Diff line
@@ -341,6 +341,12 @@ cifs_put_tlink(struct tcon_link *tlink) 
	return;

}



static inline struct tcon_link *

cifs_get_tlink(struct tcon_link *tlink)

{

	return tlink;

}



/* This function is always expected to succeed */

static inline struct cifsTconInfo *

cifs_sb_master_tcon(struct cifs_sb_info *cifs_sb)
@@ -389,7 +395,7 @@ struct cifsFileInfo { 
	struct file *pfile; /* needed for writepage */

	struct inode *pInode; /* needed for oplock break */

	struct vfsmount *mnt;

	struct cifsTconInfo *tcon;

	struct tcon_link *tlink;

	struct mutex lock_mutex;

	struct list_head llist; /* list of byte range locks we have. */

	bool closePend:1;	/* file is marked to close */
@@ -411,6 +417,7 @@ static inline void cifsFileInfo_get(struct cifsFileInfo *cifs_file) 
static inline void cifsFileInfo_put(struct cifsFileInfo *cifs_file)

{

	if (atomic_dec_and_test(&cifs_file->count)) {

		cifs_put_tlink(cifs_file->tlink);

		iput(cifs_file->pInode);

		kfree(cifs_file);

	}

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ extern struct timespec cnvrtDosUnixTm(__le16 le_date, __le16 le_time, 


extern struct cifsFileInfo *cifs_new_fileinfo(struct inode *newinode,

				__u16 fileHandle, struct file *file,

				struct vfsmount *mnt, struct cifsTconInfo *tcon,

				struct vfsmount *mnt, struct tcon_link *tlink,

				unsigned int oflags, __u32 oplock);

extern int cifs_posix_open(char *full_path, struct inode **pinode,

				struct super_block *sb,

fs/cifs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ build_path_from_dentry(struct dentry *direntry) 


struct cifsFileInfo *

cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file,

		  struct vfsmount *mnt, struct cifsTconInfo *tcon,

		  struct vfsmount *mnt, struct tcon_link *tlink,

		  unsigned int oflags, __u32 oplock)

{

	struct cifsFileInfo *pCifsFile;
@@ -149,7 +149,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, 
	pCifsFile->pfile = file;

	pCifsFile->invalidHandle = false;

	pCifsFile->closePend = false;

	pCifsFile->tcon = tcon;

	pCifsFile->tlink = cifs_get_tlink(tlink);

	mutex_init(&pCifsFile->fh_mutex);

	mutex_init(&pCifsFile->lock_mutex);

	INIT_LIST_HEAD(&pCifsFile->llist);
@@ -157,7 +157,7 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, 
	INIT_WORK(&pCifsFile->oplock_break, cifs_oplock_break);



	write_lock(&GlobalSMBSeslock);

	list_add(&pCifsFile->tlist, &tcon->openFileList);

	list_add(&pCifsFile->tlist, &(tlink_tcon(tlink)->openFileList));

	pCifsInode = CIFS_I(newinode);

	if (pCifsInode) {

		/* if readable file instance put first in list*/
@@ -483,7 +483,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
		}



		pfile_info = cifs_new_fileinfo(newinode, fileHandle, filp,

					       nd->path.mnt, tcon, oflags,

						nd->path.mnt, tlink, oflags,

						oplock);

		if (pfile_info == NULL) {

			fput(filp);
@@ -758,7 +758,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
			}



			cfile = cifs_new_fileinfo(newInode, fileHandle, filp,

						  nd->path.mnt, pTcon,

						  nd->path.mnt, tlink,

						  nd->intent.open.flags,

						  oplock);

			if (cfile == NULL) {

fs/cifs/file.c

+16 −15
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ int cifs_open(struct inode *inode, struct file *file) 


			pCifsFile = cifs_new_fileinfo(inode, netfid, file,

							file->f_path.mnt,

							tcon, oflags, oplock);

							tlink, oflags, oplock);

			if (pCifsFile == NULL) {

				CIFSSMBClose(xid, tcon, netfid);

				rc = -ENOMEM;
@@ -376,7 +376,7 @@ int cifs_open(struct inode *inode, struct file *file) 
		goto out;



	pCifsFile = cifs_new_fileinfo(inode, netfid, file, file->f_path.mnt,

					tcon, file->f_flags, oplock);

					tlink, file->f_flags, oplock);

	if (pCifsFile == NULL) {

		rc = -ENOMEM;

		goto out;
@@ -468,7 +468,7 @@ static int cifs_reopen_file(struct file *file, bool can_flush) 
	}



	cifs_sb = CIFS_SB(inode->i_sb);

	tcon = pCifsFile->tcon;

	tcon = tlink_tcon(pCifsFile->tlink);



/* can not grab rename sem here because various ops, including

   those that already have the rename sem can end up causing writepage
@@ -582,7 +582,7 @@ int cifs_close(struct inode *inode, struct file *file) 
	xid = GetXid();



	cifs_sb = CIFS_SB(inode->i_sb);

	pTcon = pSMBFile->tcon;

	pTcon = tlink_tcon(pSMBFile->tlink);

	if (pSMBFile) {

		struct cifsLockInfo *li, *tmp;

		write_lock(&GlobalSMBSeslock);
@@ -660,7 +660,7 @@ int cifs_closedir(struct inode *inode, struct file *file) 
	xid = GetXid();



	if (pCFileStruct) {

		struct cifsTconInfo *pTcon = pCFileStruct->tcon;

		struct cifsTconInfo *pTcon = tlink_tcon(pCFileStruct->tlink);



		cFYI(1, "Freeing private data in close dir");

		write_lock(&GlobalSMBSeslock);
@@ -684,6 +684,7 @@ int cifs_closedir(struct inode *inode, struct file *file) 
			else

				cifs_buf_release(ptmp);

		}

		cifs_put_tlink(pCFileStruct->tlink);

		kfree(file->private_data);

		file->private_data = NULL;

	}
@@ -770,7 +771,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock) 
		cFYI(1, "Unknown type of lock");



	cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

	tcon = ((struct cifsFileInfo *)file->private_data)->tcon;

	tcon = tlink_tcon(((struct cifsFileInfo *)file->private_data)->tlink);



	if (file->private_data == NULL) {

		rc = -EBADF;
@@ -970,7 +971,7 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data, 
		return -EBADF;



	open_file = file->private_data;

	pTcon = open_file->tcon;

	pTcon = tlink_tcon(open_file->tlink);



	rc = generic_write_checks(file, poffset, &write_size, 0);

	if (rc)
@@ -1071,7 +1072,7 @@ static ssize_t cifs_write(struct file *file, const char *write_data, 
	if (file->private_data == NULL)

		return -EBADF;

	open_file = file->private_data;

	pTcon = open_file->tcon;

	pTcon = tlink_tcon(open_file->tlink);



	xid = GetXid();
@@ -1393,7 +1394,7 @@ static int cifs_writepages(struct address_space *mapping, 
		return generic_writepages(mapping, wbc);

	}



	tcon = open_file->tcon;

	tcon = tlink_tcon(open_file->tlink);

	if (!experimEnabled && tcon->ses->server->secMode &

			(SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {

		cifsFileInfo_put(open_file);
@@ -1672,7 +1673,7 @@ int cifs_fsync(struct file *file, int datasync) 
	if (rc == 0) {

		rc = CIFS_I(inode)->write_behind_rc;

		CIFS_I(inode)->write_behind_rc = 0;

		tcon = smbfile->tcon;

		tcon = tlink_tcon(smbfile->tlink);

		if (!rc && tcon && smbfile &&

		   !(CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC))

			rc = CIFSSMBFlush(xid, tcon, smbfile->netfid);
@@ -1764,7 +1765,7 @@ ssize_t cifs_user_read(struct file *file, char __user *read_data, 
		return rc;

	}

	open_file = file->private_data;

	pTcon = open_file->tcon;

	pTcon = tlink_tcon(open_file->tlink);



	if ((file->f_flags & O_ACCMODE) == O_WRONLY)

		cFYI(1, "attempting read on write only file instance");
@@ -1845,7 +1846,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 
		return rc;

	}

	open_file = file->private_data;

	pTcon = open_file->tcon;

	pTcon = tlink_tcon(open_file->tlink);



	if ((file->f_flags & O_ACCMODE) == O_WRONLY)

		cFYI(1, "attempting read on write only file instance");
@@ -1981,7 +1982,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
	}

	open_file = file->private_data;

	cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);

	pTcon = open_file->tcon;

	pTcon = tlink_tcon(open_file->tlink);



	/*

	 * Reads as many pages as possible from fscache. Returns -ENOBUFS
@@ -2345,8 +2346,8 @@ void cifs_oplock_break(struct work_struct *work) 
	 * disconnected since oplock already released by the server

	 */

	if (!cfile->closePend && !cfile->oplock_break_cancelled) {

		rc = CIFSSMBLock(0, cfile->tcon, cfile->netfid, 0, 0, 0, 0,

				 LOCKING_ANDX_OPLOCK_RELEASE, false);

		rc = CIFSSMBLock(0, tlink_tcon(cfile->tlink), cfile->netfid, 0,

				 0, 0, 0, LOCKING_ANDX_OPLOCK_RELEASE, false);

		cFYI(1, "Oplock release rc = %d", rc);

	}