cifs: convert the path to utf16 in smb2_query_info_compound
Subsystems (2)
PATCH 1/2 cifs: convert the path to utf16 in smb2_query_info_compound
and not in the callers.
--- fs/cifs/smb2ops.c | 23 ++++++++++++----------- fs/cifs/smb2proto.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-)
fs/cifs/smb2ops.c +12 -11
@@ -1192,17 +1192,12 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, struct cifs_sb_info *cifs_sb) {int rc; -__le16 *utf16_path;struct kvec rsp_iov = {NULL ,0 };int buftype =CIFS_NO_BUFFER ;struct smb2_query_info_rsp *rsp;struct smb2_file_full_ea_info *info =NULL ; - utf16_path =cifs_convert_path_to_utf16 (path, cifs_sb); -if (!utf16_path) -return -ENOMEM ; - - rc = smb2_query_info_compound(xid, tcon, utf16_path, + rc = smb2_query_info_compound(xid, tcon, path, FILE_READ_EA, FILE_FULL_EA_INFORMATION, SMB2_O_INFO_FILE,
@@ -1235,7 +1230,6 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, le32_to_cpu(rsp->OutputBufferLength), ea_name); qeas_exit: -kfree (utf16_path);free_rsp_buf (buftype, rsp_iov.iov_base);return rc; }
@@ -1295,7 +1289,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,* the new EA. If not we should not add it since we * would not be able to even read the EAs back. */ - rc = smb2_query_info_compound(xid, tcon, utf16_path, + rc = smb2_query_info_compound(xid, tcon, path, FILE_READ_EA, FILE_FULL_EA_INFORMATION, SMB2_O_INFO_FILE,
@@ -2646,7 +2640,7 @@ smb2_set_next_command(struct cifs_tcon *tcon, struct smb_rqst *rqst)*/ int smb2_query_info_compound (const unsigned int xid,struct cifs_tcon *tcon, -__le16 *utf16_path,u32 desired_access, +const char *path,u32 desired_access,u32 class,u32 type,u32 output_len,struct kvec *rsp,int *buftype,struct cifs_sb_info *cifs_sb)
@@ -2664,6 +2658,13 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,struct cifs_open_parms oparms;struct cifs_fid fid;int rc; +__le16 *utf16_path; + +if (!path) + path ="" ; + utf16_path =cifs_convert_path_to_utf16 (path, cifs_sb); +if (!utf16_path) +return -ENOMEM ;if (smb3_encryption_required (tcon)) flags |=CIFS_TRANSFORM_REQ ;
@@ -2729,6 +2730,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon, *buftype = resp_buftype[1 ]; qic_exit: +kfree (utf16_path);SMB2_open_free (&rqst[0 ]);SMB2_query_info_free (&rqst[1 ]);SMB2_close_free (&rqst[2 ]);
@@ -2743,13 +2745,12 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, {struct smb2_query_info_rsp *rsp;struct smb2_fs_full_size_info *info =NULL ; -__le16 utf16_path =0 ;/* Null - open root of share */ struct kvec rsp_iov = {NULL ,0 };int buftype =CIFS_NO_BUFFER ;int rc; - rc = smb2_query_info_compound(xid, tcon, &utf16_path, + rc = smb2_query_info_compound(xid, tcon, "", FILE_READ_ATTRIBUTES, FS_FULL_SIZE_INFORMATION, SMB2_O_INFO_FILESYSTEM,
fs/cifs/smb2proto.h +1 -1
@@ -283,7 +283,7 @@ extern int smb311_update_preauth_hash(struct cifs_ses *ses, struct kvec *iov, int nvec);extern int smb2_query_info_compound (const unsigned int xid,struct cifs_tcon *tcon, -__le16 *utf16_path,u32 desired_access, +const char *path,u32 desired_access,u32 class,u32 type,u32 output_len,struct kvec *rsp,int *buftype,struct cifs_sb_info *cifs_sb);
Signature · 1 line
2.30.2
PATCH 2/2 cifs: change smb2_query_info_compound to use a cached fid, if available
This will reduce the number of Open/Close we send on the wire and replace a Open/GetInfo/Close compound with just a simple GetInfo request IF we have a cached handle for the object.
--- fs/cifs/smb2ops.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-)
fs/cifs/smb2ops.c +35 -10
@@ -2659,6 +2659,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,struct cifs_fid fid;int rc;__le16 *utf16_path; +struct cached_fid *cfid =NULL ;if (!path) path ="" ;
@@ -2673,6 +2674,8 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon, resp_buftype[0 ] = resp_buftype[1 ] = resp_buftype[2 ] =CIFS_NO_BUFFER ;memset (rsp_iov,0 ,sizeof (rsp_iov)); + rc =open_cached_dir (xid, tcon, path, cifs_sb, &cfid); +memset (&open_iov,0 ,sizeof (open_iov)); rqst[0 ].rq_iov = open_iov; rqst[0 ].rq_nvec =SMB2_CREATE_IOV_SIZE ;
@@ -2694,15 +2697,29 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon, rqst[1 ].rq_iov = qi_iov; rqst[1 ].rq_nvec =1 ; - rc =SMB2_query_info_init (tcon, server, - &rqst[1 ],COMPOUND_FID ,COMPOUND_FID , - class, type,0 , - output_len,0 , -NULL ); +if (cfid) { + rc =SMB2_query_info_init (tcon, server, + &rqst[1 ], + cfid->fid->persistent_fid, + cfid->fid->volatile_fid, + class, type,0 , + output_len,0 , +NULL ); + }else { + rc =SMB2_query_info_init (tcon, server, + &rqst[1 ], +COMPOUND_FID , +COMPOUND_FID , + class, type,0 , + output_len,0 , +NULL ); + }if (rc) goto qic_exit; -smb2_set_next_command (tcon, &rqst[1 ]); -smb2_set_related (&rqst[1 ]); +if (!cfid) { +smb2_set_next_command (tcon, &rqst[1 ]); +smb2_set_related (&rqst[1 ]); + }memset (&close_iov,0 ,sizeof (close_iov)); rqst[2 ].rq_iov = close_iov;
@@ -2714,9 +2731,15 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon, goto qic_exit;smb2_set_related (&rqst[2 ]); - rc =compound_send_recv (xid, ses, server, - flags,3 , rqst, - resp_buftype, rsp_iov); +if (cfid) { + rc =compound_send_recv (xid, ses, server, + flags,1 , &rqst[1 ], + &resp_buftype[1 ], &rsp_iov[1 ]); + }else { + rc =compound_send_recv (xid, ses, server, + flags,3 , rqst, + resp_buftype, rsp_iov); + }if (rc) {free_rsp_buf (resp_buftype[1 ], rsp_iov[1 ].iov_base);if (rc == -EREMCHG ) {
@@ -2736,6 +2759,8 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,SMB2_close_free (&rqst[2 ]);free_rsp_buf (resp_buftype[0 ], rsp_iov[0 ].iov_base);free_rsp_buf (resp_buftype[2 ], rsp_iov[2 ].iov_base); +if (cfid) +close_cached_dir (cfid);return rc; }
Signature · 1 line
2.30.2
Re: [PATCH 2/2] cifs: change smb2_query_info_compound to use a cached fid, if available
Quoted 8 lines · Ronnie Sahlberg
This will reduce the number of Open/Close we send on the wire and replace a Open/GetInfo/Close compound with just a simple GetInfo request IF we have a cached handle for the object.
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2ops.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-)
Re: [PATCH 2/2] cifs: change smb2_query_info_compound to use a cached fid, if available
also fixed one minor typo in the patch (missing space)
Quoted 13 lines · Paulo Alcantara
Quoted 8 lines · Ronnie Sahlberg
This will reduce the number of Open/Close we send on the wire and replace a Open/GetInfo/Close compound with just a simple GetInfo request IF we have a cached handle for the object.
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2ops.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-)Reviewed-by Paulo Alcantara (SUSE) <[email protected]>
Signature · 3 lines
Thanks, Steve
Quoted 7 lines · Ronnie Sahlberg
and not in the callers.
Signed-off-by Ronnie Sahlberg <[email protected]>--- fs/cifs/smb2ops.c | 23 ++++++++++++----------- fs/cifs/smb2proto.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-)