Commit 45c0f1aa authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: rename the *_shroot* functions to *_cached_dir* 



These functions will eventually be used to cache any directory, not just the root
so change the names.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent e6eb1950

fs/cifs/cifssmb.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon) 
	mutex_lock(&tcon->crfid.fid_mutex);

	tcon->crfid.is_valid = false;

	/* cached handle is not valid, so SMB2_CLOSE won't be sent below */

	close_shroot_lease_locked(&tcon->crfid);

	close_cached_dir_lease_locked(&tcon->crfid);

	memset(tcon->crfid.fid, 0, sizeof(struct cifs_fid));

	mutex_unlock(&tcon->crfid.fid_mutex);

fs/cifs/smb2inode.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, 
		return -ENOMEM;



	/* If it is a root and its handle is cached then use it */

	rc = open_shroot(xid, tcon, full_path, cifs_sb, &cfid);

	rc = open_cached_dir(xid, tcon, full_path, cifs_sb, &cfid);

	if (!rc) {

		if (tcon->crfid.file_all_info_is_valid) {

			move_smb2_info_to_cifs(data,
@@ -536,7 +536,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, 
			if (!rc)

				move_smb2_info_to_cifs(data, smb2_data);

		}

		close_shroot(cfid);

		close_cached_dir(cfid);

		goto out;

	}

fs/cifs/smb2ops.c

+10 −9
Original line number Diff line number Diff line
@@ -693,14 +693,14 @@ smb2_close_cached_fid(struct kref *ref) 
	}

}



void close_shroot(struct cached_fid *cfid)

void close_cached_dir(struct cached_fid *cfid)

{

	mutex_lock(&cfid->fid_mutex);

	kref_put(&cfid->refcount, smb2_close_cached_fid);

	mutex_unlock(&cfid->fid_mutex);

}



void close_shroot_lease_locked(struct cached_fid *cfid)

void close_cached_dir_lease_locked(struct cached_fid *cfid)

{

	if (cfid->has_lease) {

		cfid->has_lease = false;
@@ -708,10 +708,10 @@ void close_shroot_lease_locked(struct cached_fid *cfid) 
	}

}



void close_shroot_lease(struct cached_fid *cfid)

void close_cached_dir_lease(struct cached_fid *cfid)

{

	mutex_lock(&cfid->fid_mutex);

	close_shroot_lease_locked(cfid);

	close_cached_dir_lease_locked(cfid);

	mutex_unlock(&cfid->fid_mutex);

}
@@ -721,13 +721,14 @@ smb2_cached_lease_break(struct work_struct *work) 
	struct cached_fid *cfid = container_of(work,

				struct cached_fid, lease_break);



	close_shroot_lease(cfid);

	close_cached_dir_lease(cfid);

}



/*

 * Open the directory at the root of a share

 * Open the and cache a directory handle.

 * Only supported for the root handle.

 */

int open_shroot(unsigned int xid, struct cifs_tcon *tcon,

int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,

		const char *path,

		struct cifs_sb_info *cifs_sb,

		struct cached_fid **cfid)
@@ -930,7 +931,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.fid = &fid;

	oparms.reconnect = false;



	rc = open_shroot(xid, tcon, "", cifs_sb, &cfid);

	rc = open_cached_dir(xid, tcon, "", cifs_sb, &cfid);

	if (rc == 0)

		memcpy(&fid, cfid->fid, sizeof(struct cifs_fid));

	else
@@ -952,7 +953,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, 
	if (cfid == NULL)

		SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);

	else

		close_shroot(cfid);

		close_cached_dir(cfid);

}



static void

fs/cifs/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon) 
	if ((tcon->need_reconnect) || (tcon->ses->need_reconnect))

		return 0;



	close_shroot_lease(&tcon->crfid);

	close_cached_dir_lease(&tcon->crfid);



	rc = smb2_plain_req_init(SMB2_TREE_DISCONNECT, tcon, ses->server,

				 (void **) &req,

fs/cifs/smb2proto.h

+7 −7
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ extern struct cifs_ses *smb2_find_smb_ses(struct TCP_Server_Info *server, 
extern int smb3_handle_read_data(struct TCP_Server_Info *server,

				 struct mid_q_entry *mid);



extern int open_shroot(unsigned int xid, struct cifs_tcon *tcon,

extern int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,

			   const char *path,

			   struct cifs_sb_info *cifs_sb,

			   struct cached_fid **cfid);

extern void close_shroot(struct cached_fid *cfid);

extern void close_shroot_lease(struct cached_fid *cfid);

extern void close_shroot_lease_locked(struct cached_fid *cfid);

extern void close_cached_dir(struct cached_fid *cfid);

extern void close_cached_dir_lease(struct cached_fid *cfid);

extern void close_cached_dir_lease_locked(struct cached_fid *cfid);

extern void move_smb2_info_to_cifs(FILE_ALL_INFO *dst,

				   struct smb2_file_all_info *src);

extern int smb2_query_reparse_tag(const unsigned int xid, struct cifs_tcon *tcon,