niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

cifs: return cached_fid from open_shroot

Browse source 
Cleanup patch for followon to cache additional information for the root directory
when directory lease held.

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Ronnie Sahlberg 2020-10-05 12:37:52 +10:00 • committed by Steve French
parent 3984bdc049
commit 9e81e8ff74
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/cifs/smb2inode.c
View file

@ -511,9 +511,9 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
int rc; int rc;
struct smb2_file_all_info *smb2_data; struct smb2_file_all_info *smb2_data;
__u32 create_options = 0; __u32 create_options = 0;
struct cifs_fid fid;
bool no_cached_open = tcon->nohandlecache; bool no_cached_open = tcon->nohandlecache;
struct cifsFileInfo *cfile; struct cifsFileInfo *cfile;
struct cached_fid *cfid = NULL;
*adjust_tz = false; *adjust_tz = false;
*symlink = false; *symlink = false;
@ -525,7 +525,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
/* If it is a root and its handle is cached then use it */ /* If it is a root and its handle is cached then use it */
if (!strlen(full_path) && !no_cached_open) { if (!strlen(full_path) && !no_cached_open) {
rc = open_shroot(xid, tcon, cifs_sb, &fid); rc = open_shroot(xid, tcon, cifs_sb, &cfid);
if (rc) if (rc)
goto out; goto out;
@ -533,12 +533,13 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
move_smb2_info_to_cifs(data, move_smb2_info_to_cifs(data,
&tcon->crfid.file_all_info); &tcon->crfid.file_all_info);
} else { } else {
rc = SMB2_query_info(xid, tcon, fid.persistent_fid, rc = SMB2_query_info(xid, tcon,
fid.volatile_fid, smb2_data); cfid->fid->persistent_fid,
cfid->fid->volatile_fid, smb2_data);
if (!rc) if (!rc)
move_smb2_info_to_cifs(data, smb2_data); move_smb2_info_to_cifs(data, smb2_data);
} }
close_shroot(&tcon->crfid); close_shroot(cfid);
goto out; goto out;
} }

22
fs/cifs/smb2ops.c
View file

@ -651,7 +651,8 @@ smb2_cached_lease_break(struct work_struct *work)
* Open the directory at the root of a share * Open the directory at the root of a share
*/ */
int open_shroot(unsigned int xid, struct cifs_tcon *tcon, int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
struct cifs_sb_info *cifs_sb, struct cifs_fid *pfid) struct cifs_sb_info *cifs_sb,
struct cached_fid **cfid)
{ {
struct cifs_ses *ses = tcon->ses; struct cifs_ses *ses = tcon->ses;
struct TCP_Server_Info *server = ses->server; struct TCP_Server_Info *server = ses->server;
@ -666,11 +667,12 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
int rc, flags = 0; int rc, flags = 0;
__le16 utf16_path = 0; /* Null - since an open of top of share */ __le16 utf16_path = 0; /* Null - since an open of top of share */
u8 oplock = SMB2_OPLOCK_LEVEL_II; u8 oplock = SMB2_OPLOCK_LEVEL_II;
struct cifs_fid *pfid;
mutex_lock(&tcon->crfid.fid_mutex); mutex_lock(&tcon->crfid.fid_mutex);
if (tcon->crfid.is_valid) { if (tcon->crfid.is_valid) {
cifs_dbg(FYI, "found a cached root file handle\n"); cifs_dbg(FYI, "found a cached root file handle\n");
memcpy(pfid, tcon->crfid.fid, sizeof(struct cifs_fid)); *cfid = &tcon->crfid;
kref_get(&tcon->crfid.refcount); kref_get(&tcon->crfid.refcount);
mutex_unlock(&tcon->crfid.fid_mutex); mutex_unlock(&tcon->crfid.fid_mutex);
return 0; return 0;
@ -691,6 +693,7 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
if (!server->ops->new_lease_key) if (!server->ops->new_lease_key)
return -EIO; return -EIO;
pfid = tcon->crfid.fid;
server->ops->new_lease_key(pfid); server->ops->new_lease_key(pfid);
memset(rqst, 0, sizeof(rqst)); memset(rqst, 0, sizeof(rqst));
@ -820,6 +823,8 @@ oshr_free:
SMB2_query_info_free(&rqst[1]); SMB2_query_info_free(&rqst[1]);
free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base); free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base);
free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base); free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);
if (rc == 0)
*cfid = &tcon->crfid;
return rc; return rc;
} }
@ -833,6 +838,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
struct cifs_open_parms oparms; struct cifs_open_parms oparms;
struct cifs_fid fid; struct cifs_fid fid;
bool no_cached_open = tcon->nohandlecache; bool no_cached_open = tcon->nohandlecache;
struct cached_fid *cfid = NULL;
oparms.tcon = tcon; oparms.tcon = tcon;
oparms.desired_access = FILE_READ_ATTRIBUTES; oparms.desired_access = FILE_READ_ATTRIBUTES;
@ -841,12 +847,14 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
oparms.fid = &fid; oparms.fid = &fid;
oparms.reconnect = false; oparms.reconnect = false;
if (no_cached_open) if (no_cached_open) {
rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL, rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL,
NULL, NULL); NULL, NULL);
else } else {
rc = open_shroot(xid, tcon, cifs_sb, &fid); rc = open_shroot(xid, tcon, cifs_sb, &cfid);
if (rc == 0)
memcpy(&fid, cfid->fid, sizeof(struct cifs_fid));
}
if (rc) if (rc)
return; return;
@ -863,7 +871,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
if (no_cached_open) if (no_cached_open)
SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid); SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
else else
close_shroot(&tcon->crfid); close_shroot(cfid);
} }
static void static void

3
fs/cifs/smb2proto.h
View file

@ -70,7 +70,8 @@ extern int smb3_handle_read_data(struct TCP_Server_Info *server,
struct mid_q_entry *mid); struct mid_q_entry *mid);
extern int open_shroot(unsigned int xid, struct cifs_tcon *tcon, extern int open_shroot(unsigned int xid, struct cifs_tcon *tcon,
struct cifs_sb_info *cifs_sb, struct cifs_fid *pfid); struct cifs_sb_info *cifs_sb,
struct cached_fid **cfid);
extern void close_shroot(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(struct cached_fid *cfid);
extern void close_shroot_lease_locked(struct cached_fid *cfid); extern void close_shroot_lease_locked(struct cached_fid *cfid);