Skip to content

Commit dcb45fd

Browse files
Ronnie SahlbergSteve French
authored andcommitted
cifs: Do not use tcon->cfid directly, use the cfid we get from open_cached_dir
They are the same right now but tcon-> will later point to a different type of struct containing a list of cfids. Signed-off-by: Ronnie Sahlberg <[email protected]> Reviewed-by: Paulo Alcantara (SUSE) <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent 05b98fd commit dcb45fd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fs/cifs/smb2inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,9 +519,9 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
519519
rc = open_cached_dir(xid, tcon, full_path, cifs_sb, &cfid);
520520
/* If it is a root and its handle is cached then use it */
521521
if (!rc) {
522-
if (tcon->cfid.file_all_info_is_valid) {
522+
if (cfid->file_all_info_is_valid) {
523523
move_smb2_info_to_cifs(data,
524-
&tcon->cfid.file_all_info);
524+
&cfid->file_all_info);
525525
} else {
526526
rc = SMB2_query_info(xid, tcon,
527527
cfid->fid->persistent_fid,

fs/cifs/smb2pdu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1979,7 +1979,7 @@ SMB2_tdis(const unsigned int xid, struct cifs_tcon *tcon)
19791979
}
19801980
spin_unlock(&ses->chan_lock);
19811981

1982-
close_cached_dir_lease(&tcon->cfid);
1982+
invalidate_all_cached_dirs(tcon);
19831983

19841984
rc = smb2_plain_req_init(SMB2_TREE_DISCONNECT, tcon, ses->server,
19851985
(void **) &req,

0 commit comments

Comments
 (0)