smb: client: fix data loss due to broken rename(2)
Subsystems (2)
Paulo Alcantara
maintainerPATCH 1/1 smb: client: fix data loss due to broken rename(2)
Rename of open files in SMB2+ has been broken for a very long time, resulting in data loss as the CIFS client would fail the rename(2) call with -ENOENT and then removing the target file.
Fix this by implementing ->rename_pending_delete() for SMB2+, which will rename busy files to random filenames (e.g. silly rename) during unlink(2) or rename(2), and then marking them to delete-on-close.
Besides, introduce a FIND_RD_NO_PENDING_DELETE flag for cifs_get_readable_path() to be used in smb2_query_path_info() and smb2_query_reparse_point() so we don't end up reusing open handles of files that were already removed.
--- fs/smb/client/cifsglob.h | 5 ++ fs/smb/client/cifsproto.h | 4 +- fs/smb/client/file.c | 18 ++++- fs/smb/client/inode.c | 6 +- fs/smb/client/smb2glob.h | 1 + fs/smb/client/smb2inode.c | 151 +++++++++++++++++++++++++++++++++++++- fs/smb/client/smb2ops.c | 4 + fs/smb/client/smb2proto.h | 3 + fs/smb/client/trace.h | 3 + 9 files changed, 184 insertions(+), 11 deletions(-)
fs/smb/client/cifsglob.h +5 -0
@@ -1886,6 +1886,9 @@ static inline bool is_replayable_error(int error)#define FIND_WR_FSUID_ONLY 1#define FIND_WR_WITH_DELETE 2 +/* cifs_get_readable_path() flags */ +#define FIND_RD_NO_PENDING_DELETE 1 +#define MID_FREE 0#define MID_REQUEST_ALLOCATED 1#define MID_REQUEST_SUBMITTED 2
@@ -2343,6 +2346,8 @@ struct smb2_compound_vars {struct kvec qi_iov;struct kvec io_iov[SMB2_IOCTL_IOV_SIZE ];struct kvec si_iov[SMB2_SET_INFO_IOV_SIZE ]; +struct kvec fdis_iov[SMB2_SET_INFO_IOV_SIZE ]; +struct kvec rename_iov[SMB2_SET_INFO_IOV_SIZE ];struct kvec close_iov;struct smb2_file_rename_info_hdr rename_info;struct smb2_file_link_info_hdr link_info;
fs/smb/client/cifsproto.h +2 -2
@@ -176,8 +176,8 @@ extern int cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,int flags, struct cifsFileInfo **ret_file);extern struct cifsFileInfo *find_readable_file (struct cifsInodeInfo *,bool ); -extern int cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, -struct cifsFileInfo **ret_file); +int cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, +unsigned int flags,struct cifsFileInfo **ret_file);extern int cifs_get_hardlink_path (struct cifs_tcon *tcon,struct inode *inode,struct file *file);extern unsigned int smbCalcSize (void *buf);
fs/smb/client/file.c +14 -4
@@ -1000,7 +1000,7 @@ int cifs_open(struct inode *inode, struct file *file)if (OPEN_FMODE (file->f_flags) &FMODE_WRITE ) { rc =cifs_get_writable_path (tcon, full_path,FIND_WR_FSUID_ONLY , &cfile); }else { - rc =cifs_get_readable_path (tcon, full_path, &cfile); + rc =cifs_get_readable_path (tcon, full_path,0 , &cfile); }if (rc ==0 ) {unsigned int oflags = file->f_flags & ~(O_CREAT |O_EXCL |O_TRUNC );
@@ -2622,9 +2622,8 @@ cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,return -ENOENT ; } -int -cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, -struct cifsFileInfo **ret_file) +int cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, +unsigned int flags,struct cifsFileInfo **ret_file) {struct cifsFileInfo *cfile;void *page =alloc_dentry_path ();
@@ -2647,6 +2646,17 @@ cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,spin_unlock (&tcon->open_file_lock);free_dentry_path (page); *ret_file =find_readable_file (cinode,0 ); +if (*ret_file) { +spin_lock (&cinode->open_file_lock); +if ((flags &FIND_RD_NO_PENDING_DELETE ) && + (*ret_file)->status_file_deleted) { +spin_unlock (&cinode->open_file_lock); +cifsFileInfo_put (*ret_file); + *ret_file =NULL ; + }else { +spin_unlock (&cinode->open_file_lock); + } + }return *ret_file ?0 : -ENOENT ; }
fs/smb/client/inode.c +5 -1
@@ -2003,7 +2003,11 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) goto psx_del_no_retry; } - rc = server->ops->unlink (xid, tcon, full_path, cifs_sb, dentry); +if (server->vals->protocol_id >SMB10_PROT_ID && +d_is_positive (dentry) &&d_count (dentry) >2 ) + rc = -EBUSY ; +else + rc = server->ops->unlink (xid, tcon, full_path, cifs_sb, dentry); psx_del_no_retry:if (!rc) {
fs/smb/client/smb2glob.h +1 -0
@@ -39,6 +39,7 @@ enum smb2_compound_ops {SMB2_OP_GET_REPARSE ,SMB2_OP_QUERY_WSL_EA ,SMB2_OP_OPEN_QUERY , + SMB2_OP_SET_FILE_DISP, };/* Used when constructing chained read requests. */
fs/smb/client/smb2inode.c +147 -4
190 lines not on this page · raw message
fs/smb/client/smb2ops.c +4 -0
@@ -5376,6 +5376,7 @@ struct smb_version_operations smb20_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#endif /* CIFS_ALLOW_INSECURE_LEGACY */
@@ -5481,6 +5482,7 @@ struct smb_version_operations smb21_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb30_operations = {
@@ -5597,6 +5599,7 @@ struct smb_version_operations smb30_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb311_operations = {
@@ -5713,6 +5716,7 @@ struct smb_version_operations smb311_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY
fs/smb/client/smb2proto.h +3 -0
@@ -317,5 +317,8 @@ int posix_info_sid_size(const void *beg, const void *end);int smb2_make_nfs_node (unsigned int xid,struct inode *inode,struct dentry *dentry,struct cifs_tcon *tcon,const char *full_path,umode_t mode,dev_t dev); +int smb2_rename_pending_delete (const char *full_path, +struct dentry *dentry, +const unsigned int xid);#endif /* _SMB2PROTO_H */
fs/smb/client/trace.h +3 -0
@@ -675,6 +675,7 @@ DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(set_info_compound_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (set_reparse_compound_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (get_reparse_compound_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (query_wsl_ea_compound_enter); +DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (set_file_disp_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (delete_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (mkdir_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (tdis_enter);
@@ -716,6 +717,7 @@ DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(set_info_compound_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (set_reparse_compound_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (get_reparse_compound_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (query_wsl_ea_compound_done); +DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (set_file_disp_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (delete_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (mkdir_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (tdis_done);
@@ -762,6 +764,7 @@ DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(set_info_compound_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (set_reparse_compound_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (get_reparse_compound_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (query_wsl_ea_compound_err); +DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (set_file_disp_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (mkdir_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (delete_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (tdis_err);
Signature · 1 line
2.51.0
merged into cifs-2.6.git for-next pending more review and testing (running more tests on it now)
Added Cc: stable
Quoted 426 lines · Paulo Alcantara
Rename of open files in SMB2+ has been broken for a very long time, resulting in data loss as the CIFS client would fail the rename(2) call with
-ENOENTand then removing the target file.Fix this by implementing ->rename_pending_delete() for SMB2+, which will rename busy files to random filenames (e.g. silly rename) during unlink(2) or rename(2), and then marking them to delete-on-close.
Besides, introduce a
FIND_RD_NO_PENDING_DELETEflag forcifs_get_readable_path()to be used insmb2_query_path_info()andsmb2_query_reparse_point()so we don't end up reusing open handles of files that were already removed.Reported-by Jean-Baptiste Denis <[email protected]>Signed-off-by Paulo Alcantara (Red Hat) <[email protected]>Reviewed-by David Howells <[email protected]>Cc Frank Sorenson <[email protected]>Cc Olga Kornievskaia <[email protected]>Cc Benjamin Coddington <[email protected]>Cc Scott Mayhew <[email protected]>--- fs/smb/client/cifsglob.h | 5 ++ fs/smb/client/cifsproto.h | 4 +- fs/smb/client/file.c | 18 ++++- fs/smb/client/inode.c | 6 +- fs/smb/client/smb2glob.h | 1 + fs/smb/client/smb2inode.c | 151 +++++++++++++++++++++++++++++++++++++- fs/smb/client/smb2ops.c | 4 + fs/smb/client/smb2proto.h | 3 + fs/smb/client/trace.h | 3 + 9 files changed, 184 insertions(+), 11 deletions(-)fs/smb/client/cifsglob.h +5
-0@@ -1886,6 +1886,9 @@ static inline bool is_replayable_error(int error)#define FIND_WR_FSUID_ONLY 1#define FIND_WR_WITH_DELETE 2 +/* cifs_get_readable_path() flags */ +#define FIND_RD_NO_PENDING_DELETE 1 +#define MID_FREE 0#define MID_REQUEST_ALLOCATED 1#define MID_REQUEST_SUBMITTED 2@@ -2343,6 +2346,8 @@ struct smb2_compound_vars {struct kvec qi_iov;struct kvec io_iov[SMB2_IOCTL_IOV_SIZE ];struct kvec si_iov[SMB2_SET_INFO_IOV_SIZE ]; +struct kvec fdis_iov[SMB2_SET_INFO_IOV_SIZE ]; +struct kvec rename_iov[SMB2_SET_INFO_IOV_SIZE ];struct kvec close_iov;struct smb2_file_rename_info_hdr rename_info;struct smb2_file_link_info_hdr link_info;fs/smb/client/cifsproto.h +2
-2@@ -176,8 +176,8 @@ extern int cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,int flags, struct cifsFileInfo **ret_file);extern struct cifsFileInfo *find_readable_file (struct cifsInodeInfo *,bool ); -extern int cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, -struct cifsFileInfo **ret_file); +int cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, +unsigned int flags,struct cifsFileInfo **ret_file);extern int cifs_get_hardlink_path (struct cifs_tcon *tcon,struct inode *inode,struct file *file);extern unsigned int smbCalcSize (void *buf);fs/smb/client/file.c +14
-4@@ -1000,7 +1000,7 @@ int cifs_open(struct inode *inode, struct file *file)if (OPEN_FMODE (file->f_flags) &FMODE_WRITE ) { rc =cifs_get_writable_path (tcon, full_path,FIND_WR_FSUID_ONLY , &cfile); }else { - rc =cifs_get_readable_path (tcon, full_path, &cfile); + rc =cifs_get_readable_path (tcon, full_path,0 , &cfile); }if (rc ==0 ) {unsigned int oflags = file->f_flags & ~(O_CREAT |O_EXCL |O_TRUNC );@@ -2622,9 +2622,8 @@ cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,return -ENOENT ; } -int -cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, -struct cifsFileInfo **ret_file) +int cifs_get_readable_path (struct cifs_tcon *tcon,const char *name, +unsigned int flags,struct cifsFileInfo **ret_file) {struct cifsFileInfo *cfile;void *page =alloc_dentry_path ();@@ -2647,6 +2646,17 @@ cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,spin_unlock (&tcon->open_file_lock);free_dentry_path (page); *ret_file =find_readable_file (cinode,0 ); +if (*ret_file) { +spin_lock (&cinode->open_file_lock); +if ((flags &FIND_RD_NO_PENDING_DELETE ) && + (*ret_file)->status_file_deleted) { +spin_unlock (&cinode->open_file_lock); +cifsFileInfo_put (*ret_file); + *ret_file =NULL ; + }else { +spin_unlock (&cinode->open_file_lock); + } + }return *ret_file ?0 : -ENOENT ; }fs/smb/client/inode.c +5
-1@@ -2003,7 +2003,11 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) goto psx_del_no_retry; } - rc = server->ops->unlink (xid, tcon, full_path, cifs_sb, dentry); +if (server->vals->protocol_id >SMB10_PROT_ID && +d_is_positive (dentry) &&d_count (dentry) >2 ) + rc = -EBUSY ; +else + rc = server->ops->unlink (xid, tcon, full_path, cifs_sb, dentry); psx_del_no_retry:if (!rc) {fs/smb/client/smb2glob.h +1
-0@@ -39,6 +39,7 @@ enum smb2_compound_ops {SMB2_OP_GET_REPARSE ,SMB2_OP_QUERY_WSL_EA ,SMB2_OP_OPEN_QUERY , + SMB2_OP_SET_FILE_DISP, };/* Used when constructing chained read requests. */ fs/smb/client/smb2inode.c +147
-4@@ -440,7 +440,7 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, ses->Suid, full_path);break ;case SMB2_OP_RENAME : - rqst[num_rqst].rq_iov = &vars->si_iov[0 ]; + rqst[num_rqst].rq_iov = vars->rename_iov; rqst[num_rqst].rq_nvec =2 ; len = in_iov[i].iov_len;@@ -594,6 +594,41 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,trace_smb3_query_wsl_ea_compound_enter (xid, tcon->tid, ses->Suid, full_path);break ; +case SMB2_OP_SET_FILE_DISP : + rqst[num_rqst].rq_iov = vars->fdis_iov; + rqst[num_rqst].rq_nvec =1 ; + + size[0 ] = in_iov[i].iov_len; + data[0 ] = in_iov[i].iov_base; + +if (cfile) { + rc =SMB2_set_info_init (tcon, server, + &rqst[num_rqst], + cfile->fid.persistent_fid, + cfile->fid.volatile_fid, + current->tgid, +FILE_DISPOSITION_INFORMATION , +SMB2_O_INFO_FILE ,0 , + data, size); + }else { + rc =SMB2_set_info_init (tcon, server, + &rqst[num_rqst], +COMPOUND_FID , +COMPOUND_FID , + current->tgid, +FILE_DISPOSITION_INFORMATION , +SMB2_O_INFO_FILE ,0 , + data, size); + } +if (!rc && (!cfile || num_rqst >1 )) { +smb2_set_next_command (tcon, &rqst[num_rqst]); +smb2_set_related (&rqst[num_rqst]); + }else if (rc) { + goto finished; + } + num_rqst++; +trace_smb3_set_file_disp_enter (xid, tcon->tid, ses->Suid, full_path); +break ;default :cifs_dbg (VFS ,"Invalid command\n" ); rc = -EINVAL ;@@ -843,6 +878,13 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, }SMB2_query_info_free (&rqst[num_rqst++]);break ; +case SMB2_OP_SET_FILE_DISP : +if (!rc) +trace_smb3_set_file_disp_done (xid, tcon->tid, ses->Suid); +else +trace_smb3_set_file_disp_err (xid, tcon->tid, ses->Suid, rc); +SMB2_set_info_free (&rqst[num_rqst++]); +break ; } }SMB2_close_free (&rqst[num_rqst]);@@ -990,7 +1032,7 @@ int smb2_query_path_info(const unsigned int xid, in_iov[1 ] = in_iov[0 ]; in_iov[2 ] = in_iov[0 ]; -cifs_get_readable_path (tcon, full_path, &cfile); +cifs_get_readable_path (tcon, full_path,FIND_RD_NO_PENDING_DELETE , &cfile); oparms =CIFS_OPARMS (cifs_sb, tcon, full_path,FILE_READ_ATTRIBUTES ,FILE_OPEN , create_options,ACL_NO_MODE ); rc = smb2_compound_op(xid, tcon, cifs_sb, full_path,@@ -1069,7 +1111,8 @@ int smb2_query_path_info(const unsigned int xid,FILE_READ_EA |SYNCHRONIZE ,FILE_OPEN , create_options | OPEN_REPARSE_POINT, ACL_NO_MODE); -cifs_get_readable_path (tcon, full_path, &cfile); +cifs_get_readable_path (tcon, full_path, +FIND_RD_NO_PENDING_DELETE , &cfile);free_rsp_iov (out_iov, out_buftype,ARRAY_SIZE (out_iov)); rc = smb2_compound_op(xid, tcon, cifs_sb, full_path, &oparms, in_iov, cmds, num_cmds,@@ -1418,7 +1461,8 @@ int smb2_query_reparse_point(const unsigned int xid,cifs_dbg (FYI ,"%s: path: %s\n" , __func__, full_path); -cifs_get_readable_path (tcon, full_path, &cfile); +cifs_get_readable_path (tcon, full_path, +FIND_RD_NO_PENDING_DELETE , &cfile); oparms =CIFS_OPARMS (cifs_sb, tcon, full_path,FILE_READ_ATTRIBUTES |FILE_READ_EA |SYNCHRONIZE ,FILE_OPEN ,OPEN_REPARSE_POINT ,ACL_NO_MODE );@@ -1438,3 +1482,102 @@ int smb2_query_reparse_point(const unsigned int xid,cifs_free_open_info (&data);return rc; } + +int smb2_rename_pending_delete (const char *full_path, +struct dentry *dentry, +const unsigned int xid) +{ +struct cifs_sb_info *cifs_sb =CIFS_SB (d_inode (dentry)->i_sb); +struct cifsInodeInfo *cinode =CIFS_I (d_inode (dentry)); + __le16 *utf16_path __free(kfree) = NULL; +__u32 co =file_create_options (dentry); +int cmds[] = { +SMB2_OP_SET_INFO , +SMB2_OP_RENAME , +SMB2_OP_SET_FILE_DISP , + }; +const int num_cmds =ARRAY_SIZE (cmds); + char *to_name __free(kfree) = NULL; +struct kvec iov[ARRAY_SIZE (cmds)]; +__u32 attrs = cinode->cifsAttrs; +struct cifs_open_parms oparms; +static atomic_t sillycounter; +struct cifsFileInfo *cfile; +struct tcon_link *tlink; +__u8 delete_pending =1 ; +struct cifs_tcon *tcon; +const char *ppath; +void *page; +size_t len; +int rc; + + tlink =cifs_sb_tlink (cifs_sb); +if (IS_ERR (tlink)) +return PTR_ERR (tlink); + tcon =tlink_tcon (tlink); + + page =alloc_dentry_path (); + + ppath =build_path_from_dentry (dentry->d_parent, page); +if (IS_ERR (ppath)) { + rc =PTR_ERR (ppath); + goto out; + } + + len =strlen (ppath) +strlen ("/.__smb1234" ) +1 ; +if (unlikely (len >=PATH_MAX )) { + rc = -ENAMETOOLONG ; + goto out; + } + to_name =kmalloc (len,GFP_KERNEL ); +if (!to_name) { + rc = -ENOMEM ; + goto out; + } + +scnprintf (to_name, len,"%s%c.__smb%04X" , ppath,CIFS_DIR_SEP (cifs_sb), +atomic_inc_return (&sillycounter) &0xffff ); + + utf16_path =cifs_convert_path_to_utf16 (to_name, cifs_sb); +if (!utf16_path) { + rc = -ENOMEM ; + goto out; + } + +drop_cached_dir_by_name (xid, tcon, full_path, cifs_sb); + oparms =CIFS_OPARMS (cifs_sb, tcon, full_path, +DELETE |FILE_WRITE_ATTRIBUTES , +FILE_OPEN , co,ACL_NO_MODE ); + + attrs &= ~ATTR_READONLY ; + iov[0 ].iov_base = &(FILE_BASIC_INFO ) { + .Attributes =cpu_to_le32 ((attrs ?:ATTR_NORMAL ) |ATTR_HIDDEN ), + }; + iov[0 ].iov_len =sizeof (FILE_BASIC_INFO ); + iov[1 ].iov_base = utf16_path; + iov[1 ].iov_len =sizeof (*utf16_path) *UniStrnlen ((wchar_t *)utf16_path,PATH_MAX ); + iov[2 ].iov_base = &delete_pending; + iov[2 ].iov_len =sizeof (delete_pending); + +cifs_get_writable_path (tcon, full_path,FIND_WR_WITH_DELETE , &cfile); + rc =smb2_compound_op (xid, tcon, cifs_sb, full_path, &oparms, iov, + cmds, num_cmds, cfile,NULL ,NULL , dentry); +if (rc == -EINVAL ) { +cifs_dbg (FYI ,"invalid lease key, resending request without lease\n" ); +cifs_get_writable_path (tcon, full_path, +FIND_WR_WITH_DELETE , &cfile); + rc =smb2_compound_op (xid, tcon, cifs_sb, full_path, &oparms, iov, + cmds, num_cmds, cfile,NULL ,NULL ,NULL ); + } +if (!rc) { +set_bit (CIFS_INO_DELETE_PENDING , &cinode->flags); + }else { +cifs_tcon_dbg (VFS ,"%s: failed to rename '%s' to '%s': %d\n" , + __func__, full_path, to_name, rc); + rc = -EIO ; + } +out: +cifs_put_tlink (tlink); +free_dentry_path (page); +return rc; +}fs/smb/client/smb2ops.c +4
-0@@ -5376,6 +5376,7 @@ struct smb_version_operations smb20_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#endif /* CIFS_ALLOW_INSECURE_LEGACY */ @@ -5481,6 +5482,7 @@ struct smb_version_operations smb21_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb30_operations = {@@ -5597,6 +5599,7 @@ struct smb_version_operations smb30_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };struct smb_version_operations smb311_operations = {@@ -5713,6 +5716,7 @@ struct smb_version_operations smb311_operations = { .llseek = smb3_llseek, .is_status_io_timeout = smb2_is_status_io_timeout, .is_network_name_deleted = smb2_is_network_name_deleted, + .rename_pending_delete = smb2_rename_pending_delete, };#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY fs/smb/client/smb2proto.h +3
-0@@ -317,5 +317,8 @@ int posix_info_sid_size(const void *beg, const void *end);int smb2_make_nfs_node (unsigned int xid,struct inode *inode,struct dentry *dentry,struct cifs_tcon *tcon,const char *full_path,umode_t mode,dev_t dev); +int smb2_rename_pending_delete (const char *full_path, +struct dentry *dentry, +const unsigned int xid);#endif /* _SMB2PROTO_H */ fs/smb/client/trace.h +3
-1@@ -675,6 +675,7 @@ DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT(set_info_compound_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (set_reparse_compound_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (get_reparse_compound_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (query_wsl_ea_compound_enter); +DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (set_file_disp_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (delete_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (mkdir_enter);DEFINE_SMB3_INF_COMPOUND_ENTER_EVENT (tdis_enter);@@ -716,6 +717,7 @@ DEFINE_SMB3_INF_COMPOUND_DONE_EVENT(set_info_compound_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (set_reparse_compound_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (get_reparse_compound_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (query_wsl_ea_compound_done); +DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (set_file_disp_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (delete_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (mkdir_done);DEFINE_SMB3_INF_COMPOUND_DONE_EVENT (tdis_done);@@ -762,6 +764,7 @@ DEFINE_SMB3_INF_COMPOUND_ERR_EVENT(set_info_compound_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (set_reparse_compound_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (get_reparse_compound_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (query_wsl_ea_compound_err); +DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (set_file_disp_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (mkdir_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (delete_err);DEFINE_SMB3_INF_COMPOUND_ERR_EVENT (tdis_err); --2.51.0
Signature · 3 lines
Thanks, Steve