cifs: use existing handle for compount_op(OP_SET_INFO) when possible
Subsystems (2)
PATCH 1/1 cifs: use existing handle for compount_op(OP_SET_INFO) when possible
If we already have a writable handle for a path we want to set the attributes for then use that instead of a create/set-info/close compound.
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/smb2inode.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-)
fs/cifs/smb2inode.c +30 -10
@@ -192,14 +192,27 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, size[0 ] =sizeof (FILE_BASIC_INFO ); data[0 ] = ptr; - rc =SMB2_set_info_init (tcon, &rqst[num_rqst],COMPOUND_FID , -COMPOUND_FID , current->tgid, -FILE_BASIC_INFORMATION , -SMB2_O_INFO_FILE ,0 , data, size); +if (cfile) + rc =SMB2_set_info_init (tcon, &rqst[num_rqst], + cfile->fid.persistent_fid, + cfile->fid.volatile_fid, current->tgid, +FILE_BASIC_INFORMATION , +SMB2_O_INFO_FILE ,0 , data, size); +else { + rc =SMB2_set_info_init (tcon, &rqst[num_rqst], +COMPOUND_FID , +COMPOUND_FID , current->tgid, +FILE_BASIC_INFORMATION , +SMB2_O_INFO_FILE ,0 , data, size); +if (!rc) { +smb2_set_next_command (tcon, &rqst[num_rqst]); +smb2_set_related (&rqst[num_rqst]); + } + } +if (rc) goto finished; -smb2_set_next_command (tcon, &rqst[num_rqst]); -smb2_set_related (&rqst[num_rqst++]); + num_rqst++;trace_smb3_set_info_compound_enter (xid, ses->Suid, tcon->tid, full_path);break ;
@@ -231,8 +244,10 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,COMPOUND_FID ,COMPOUND_FID , current->tgid,FILE_RENAME_INFORMATION , SMB2_O_INFO_FILE, 0, data, size); -smb2_set_next_command (tcon, &rqst[num_rqst]); -smb2_set_related (&rqst[num_rqst]); +if (!rc) { +smb2_set_next_command (tcon, &rqst[num_rqst]); +smb2_set_related (&rqst[num_rqst]); + } }if (rc) goto finished;
@@ -475,6 +490,7 @@ smb2_mkdir_setinfo(struct inode *inode, const char *name, {FILE_BASIC_INFO data;struct cifsInodeInfo *cifs_i; +struct cifsFileInfo *cfile;u32 dosattrs;int tmprc;
@@ -482,10 +498,11 @@ smb2_mkdir_setinfo(struct inode *inode, const char *name, cifs_i =CIFS_I (inode); dosattrs = cifs_i->cifsAttrs |ATTR_READONLY ; data.Attributes =cpu_to_le32 (dosattrs); +cifs_get_writable_path (tcon, name, &cfile); tmprc =smb2_compound_op (xid, tcon, cifs_sb, name,FILE_WRITE_ATTRIBUTES ,FILE_CREATE ,CREATE_NOT_FILE , &data,SMB2_OP_SET_INFO , -NULL ); + cfile);if (tmprc ==0 ) cifs_i->cifsAttrs = dosattrs; }
@@ -570,6 +587,7 @@ smb2_set_file_info(struct inode *inode, const char *full_path, {struct cifs_sb_info *cifs_sb =CIFS_SB (inode->i_sb);struct tcon_link *tlink; +struct cifsFileInfo *cfile;int rc; if ((buf->CreationTime == 0) && (buf->LastAccessTime == 0) &&
@@ -581,9 +599,11 @@ smb2_set_file_info(struct inode *inode, const char *full_path,if (IS_ERR (tlink))return PTR_ERR (tlink); +cifs_get_writable_path (tlink_tcon (tlink), full_path, &cfile); + rc =smb2_compound_op (xid,tlink_tcon (tlink), cifs_sb, full_path,FILE_WRITE_ATTRIBUTES ,FILE_OPEN ,0 , buf, -SMB2_OP_SET_INFO ,NULL ); +SMB2_OP_SET_INFO , cfile);cifs_put_tlink (tlink);return rc; }
Signature · 1 line
2.13.6