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

Commit 7ffec372 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: add refcounted and timestamped container for holding tcons 



Eventually, we'll need to track the use of tcons on a per-sb basis, so that
we know when it's ok to tear them down. Begin this conversion by adding a
new "tcon_link" struct and accessors that get it. For now, the core data
structures are untouched -- cifs_sb still just points to a single tcon and
the pointers are just cast to deal with the accessor functions. A later
patch will flesh this out.

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

fs/cifs/cifs_dfs_ref.c

+12 −9
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
	int xid, i;

	int rc = 0;

	struct vfsmount *mnt = ERR_PTR(-ENOENT);

	struct tcon_link *tlink;



	cFYI(1, "in %s", __func__);

	BUG_ON(IS_ROOT(dentry));
@@ -315,14 +316,6 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
	dput(nd->path.dentry);

	nd->path.dentry = dget(dentry);



	cifs_sb = CIFS_SB(dentry->d_inode->i_sb);

	ses = cifs_sb_tcon(cifs_sb)->ses;



	if (!ses) {

		rc = -EINVAL;

		goto out_err;

	}



	/*

	 * The MSDFS spec states that paths in DFS referral requests and

	 * responses must be prefixed by a single '\' character instead of
@@ -335,10 +328,20 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) 
		goto out_err;

	}



	cifs_sb = CIFS_SB(dentry->d_inode->i_sb);

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

		rc = PTR_ERR(tlink);

		goto out_err;

	}

	ses = tlink_tcon(tlink)->ses;



	rc = get_dfs_path(xid, ses, full_path + 1, cifs_sb->local_nls,

		&num_referrals, &referrals,

		cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);



	cifs_put_tlink(tlink);



	for (i = 0; i < num_referrals; i++) {

		int len;

		dump_referral(referrals+i);

fs/cifs/cifsacl.c

+33 −9
Original line number Diff line number Diff line
@@ -557,11 +557,16 @@ static struct cifs_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, 
{

	struct cifs_ntsd *pntsd = NULL;

	int xid, rc;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return NULL;



	xid = GetXid();

	rc = CIFSSMBGetCIFSACL(xid, cifs_sb_tcon(cifs_sb), fid, &pntsd, pacllen);

	rc = CIFSSMBGetCIFSACL(xid, tlink_tcon(tlink), fid, &pntsd, pacllen);

	FreeXid(xid);



	cifs_put_tlink(tlink);



	cFYI(1, "GetCIFSACL rc = %d ACL len %d", rc, *pacllen);

	return pntsd;
@@ -574,10 +579,16 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	int oplock = 0;

	int xid, rc;

	__u16 fid;

	struct cifsTconInfo *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return NULL;



	tcon = tlink_tcon(tlink);

	xid = GetXid();



	rc = CIFSSMBOpen(xid, cifs_sb_tcon(cifs_sb), path, FILE_OPEN, READ_CONTROL, 0,

	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, READ_CONTROL, 0,

			 &fid, &oplock, NULL, cifs_sb->local_nls,

			 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	if (rc) {
@@ -585,11 +596,12 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
		goto out;

	}



	rc = CIFSSMBGetCIFSACL(xid, cifs_sb_tcon(cifs_sb), fid, &pntsd, pacllen);

	rc = CIFSSMBGetCIFSACL(xid, tcon, fid, &pntsd, pacllen);

	cFYI(1, "GetCIFSACL rc = %d ACL len %d", rc, *pacllen);



	CIFSSMBClose(xid, cifs_sb_tcon(cifs_sb), fid);

	CIFSSMBClose(xid, tcon, fid);

 out:

	cifs_put_tlink(tlink);

	FreeXid(xid);

	return pntsd;

}
@@ -616,10 +628,15 @@ static int set_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, __u16 fid, 
		struct cifs_ntsd *pnntsd, u32 acllen)

{

	int xid, rc;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);



	xid = GetXid();

	rc = CIFSSMBSetCIFSACL(xid, cifs_sb_tcon(cifs_sb), fid, pnntsd, acllen);

	rc = CIFSSMBSetCIFSACL(xid, tlink_tcon(tlink), fid, pnntsd, acllen);

	FreeXid(xid);

	cifs_put_tlink(tlink);



	cFYI(DBG2, "SetCIFSACL rc = %d", rc);

	return rc;
@@ -631,10 +648,16 @@ static int set_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, const char *path, 
	int oplock = 0;

	int xid, rc;

	__u16 fid;

	struct cifsTconInfo *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);



	tcon = tlink_tcon(tlink);

	xid = GetXid();



	rc = CIFSSMBOpen(xid, cifs_sb_tcon(cifs_sb), path, FILE_OPEN, WRITE_DAC, 0,

	rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, WRITE_DAC, 0,

			 &fid, &oplock, NULL, cifs_sb->local_nls,

			 cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	if (rc) {
@@ -642,12 +665,13 @@ static int set_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, const char *path, 
		goto out;

	}



	rc = CIFSSMBSetCIFSACL(xid, cifs_sb_tcon(cifs_sb), fid, pnntsd, acllen);

	rc = CIFSSMBSetCIFSACL(xid, tcon, fid, pnntsd, acllen);

	cFYI(DBG2, "SetCIFSACL rc = %d", rc);



	CIFSSMBClose(xid, cifs_sb_tcon(cifs_sb), fid);

	CIFSSMBClose(xid, tcon, fid);

out:

	FreeXid(xid);

	cifs_put_tlink(tlink);

	return rc;

}

fs/cifs/cifsglob.h

+38 −13
Original line number Diff line number Diff line
@@ -310,6 +310,44 @@ struct cifsTconInfo { 
	/* BB add field for back pointer to sb struct(s)? */

};



/*

 * This is a refcounted and timestamped container for a tcon pointer. The

 * container holds a tcon reference. It is considered safe to free one of

 * these when the tl_count goes to 0. The tl_time is the time of the last

 * "get" on the container.

 */

struct tcon_link {

	spinlock_t		tl_lock;

	u32			tl_count;

	u64			tl_time;

	struct cifsTconInfo	*tl_tcon;

};



static inline struct tcon_link *

cifs_sb_tlink(struct cifs_sb_info *cifs_sb)

{

	return (struct tcon_link *)cifs_sb->ptcon;

}



static inline struct cifsTconInfo *

tlink_tcon(struct tcon_link *tlink)

{

	return (struct cifsTconInfo *)tlink;

}



static inline void

cifs_put_tlink(struct tcon_link *tlink)

{

	return;

}



/* This function is always expected to succeed */

static inline struct cifsTconInfo *

cifs_sb_master_tcon(struct cifs_sb_info *cifs_sb)

{

	return cifs_sb->ptcon;

}



/*

 * This info hangs off the cifsFileInfo structure, pointed to by llist.

 * This is used to track byte stream locks on the file
@@ -413,19 +451,6 @@ CIFS_SB(struct super_block *sb) 
	return sb->s_fs_info;

}



static inline struct cifsTconInfo *

cifs_sb_tcon(struct cifs_sb_info *cifs_sb)

{

	return cifs_sb->ptcon;

}



/* This function is always expected to succeed */

static inline struct cifsTconInfo *

cifs_sb_master_tcon(struct cifs_sb_info *cifs_sb)

{

	return cifs_sb->ptcon;

}



static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)

{

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)

fs/cifs/dir.c

+48 −17
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ cifs_new_fileinfo(struct inode *newinode, __u16 fileHandle, struct file *file, 
{

	struct cifsFileInfo *pCifsFile;

	struct cifsInodeInfo *pCifsInode;

	struct cifs_sb_info *cifs_sb = CIFS_SB(mnt->mnt_sb);



	pCifsFile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);

	if (pCifsFile == NULL)
@@ -191,7 +190,8 @@ int cifs_posix_open(char *full_path, struct inode **pinode, 
	__u32 posix_flags = 0;

	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);

	struct cifs_fattr fattr;

	struct cifsTconInfo *tcon = cifs_sb_tcon(cifs_sb);

	struct tcon_link *tlink;

	struct cifsTconInfo *tcon;



	cFYI(1, "posix open %s", full_path);
@@ -226,10 +226,20 @@ int cifs_posix_open(char *full_path, struct inode **pinode, 
		posix_flags |= SMB_O_DIRECT;



	mode &= ~current_umask();



	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

		rc = PTR_ERR(tlink);

		goto posix_open_ret;

	}



	tcon = tlink_tcon(tlink);

	rc = CIFSPOSIXCreate(xid, tcon, posix_flags, mode, pnetfid, presp_data,

			     poplock, full_path, cifs_sb->local_nls,

			     cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);

	cifs_put_tlink(tlink);



	if (rc)

		goto posix_open_ret;
@@ -290,6 +300,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
	int desiredAccess = GENERIC_READ | GENERIC_WRITE;

	__u16 fileHandle;

	struct cifs_sb_info *cifs_sb;

	struct tcon_link *tlink;

	struct cifsTconInfo *tcon;

	char *full_path = NULL;

	FILE_ALL_INFO *buf = NULL;
@@ -299,13 +310,12 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
	xid = GetXid();



	cifs_sb = CIFS_SB(inode->i_sb);

	tcon = cifs_sb_tcon(cifs_sb);



	full_path = build_path_from_dentry(direntry);

	if (full_path == NULL) {

		rc = -ENOMEM;

		goto cifs_create_out;

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

		FreeXid(xid);

		return PTR_ERR(tlink);

	}

	tcon = tlink_tcon(tlink);



	if (oplockEnabled)

		oplock = REQ_OPLOCK;
@@ -315,6 +325,12 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
	else

		oflags = FMODE_READ | SMB_O_CREAT;



	full_path = build_path_from_dentry(direntry);

	if (full_path == NULL) {

		rc = -ENOMEM;

		goto cifs_create_out;

	}



	if (tcon->unix_ext && (tcon->ses->capabilities & CAP_UNIX) &&

	    (CIFS_UNIX_POSIX_PATH_OPS_CAP &

			le64_to_cpu(tcon->fsUnixInfo.Capability))) {
@@ -481,6 +497,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
cifs_create_out:

	kfree(buf);

	kfree(full_path);

	cifs_put_tlink(tlink);

	FreeXid(xid);

	return rc;

}
@@ -491,6 +508,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 
	int rc = -EPERM;

	int xid;

	struct cifs_sb_info *cifs_sb;

	struct tcon_link *tlink;

	struct cifsTconInfo *pTcon;

	char *full_path = NULL;

	struct inode *newinode = NULL;
@@ -503,10 +521,14 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 
	if (!old_valid_dev(device_number))

		return -EINVAL;



	xid = GetXid();



	cifs_sb = CIFS_SB(inode->i_sb);

	pTcon = cifs_sb_tcon(cifs_sb);

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink))

		return PTR_ERR(tlink);



	pTcon = tlink_tcon(tlink);



	xid = GetXid();



	full_path = build_path_from_dentry(direntry);

	if (full_path == NULL) {
@@ -606,6 +628,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 
	kfree(full_path);

	kfree(buf);

	FreeXid(xid);

	cifs_put_tlink(tlink);

	return rc;

}
@@ -619,6 +642,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
	__u16 fileHandle = 0;

	bool posix_open = false;

	struct cifs_sb_info *cifs_sb;

	struct tcon_link *tlink;

	struct cifsTconInfo *pTcon;

	struct cifsFileInfo *cfile;

	struct inode *newInode = NULL;
@@ -633,7 +657,12 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
	/* check whether path exists */



	cifs_sb = CIFS_SB(parent_dir_inode->i_sb);

	pTcon = cifs_sb_tcon(cifs_sb);

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

		FreeXid(xid);

		return (struct dentry *)tlink;

	}

	pTcon = tlink_tcon(tlink);



	/*

	 * Don't allow the separator character in a path component.
@@ -644,8 +673,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
		for (i = 0; i < direntry->d_name.len; i++)

			if (direntry->d_name.name[i] == '\\') {

				cFYI(1, "Invalid file name");

				FreeXid(xid);

				return ERR_PTR(-EINVAL);

				rc = -EINVAL;

				goto lookup_out;

			}

	}
@@ -655,7 +684,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
	 */

	if (nd && (nd->flags & LOOKUP_EXCL)) {

		d_instantiate(direntry, NULL);

		return NULL;

		rc = 0;

		goto lookup_out;

	}



	/* can not grab the rename sem here since it would
@@ -663,8 +693,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 
	in which we already have the sb rename sem */

	full_path = build_path_from_dentry(direntry);

	if (full_path == NULL) {

		FreeXid(xid);

		return ERR_PTR(-ENOMEM);

		rc = -ENOMEM;

		goto lookup_out;

	}



	if (direntry->d_inode != NULL) {
@@ -760,6 +790,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, 


lookup_out:

	kfree(full_path);

	cifs_put_tlink(tlink);

	FreeXid(xid);

	return ERR_PTR(rc);

}

fs/cifs/file.c

+8 −1
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	__u32 oplock;

	struct cifs_sb_info *cifs_sb;

	struct cifsTconInfo *tcon;

	struct tcon_link *tlink;

	struct cifsFileInfo *pCifsFile = NULL;

	struct cifsInodeInfo *pCifsInode;

	char *full_path = NULL;
@@ -235,7 +236,12 @@ int cifs_open(struct inode *inode, struct file *file) 
	xid = GetXid();



	cifs_sb = CIFS_SB(inode->i_sb);

	tcon = cifs_sb_tcon(cifs_sb);

	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink)) {

		FreeXid(xid);

		return PTR_ERR(tlink);

	}

	tcon = tlink_tcon(tlink);



	pCifsInode = CIFS_I(file->f_path.dentry->d_inode);
@@ -402,6 +408,7 @@ int cifs_open(struct inode *inode, struct file *file) 
	kfree(buf);

	kfree(full_path);

	FreeXid(xid);

	cifs_put_tlink(tlink);

	return rc;

}