cifs: map NT_STATUS_SHARING_VIOLATION to EBUSY instead of ETXTBSY
Subsystems (2)
PATCH v3 1/1 cifs: map NT_STATUS_SHARING_VIOLATION to EBUSY instead of ETXTBSY
NT_SHARING_VIOLATION errors are mapped to ETXTBSY which is unexpected for operations such as unlink where we can hit these errors.
The patch maps the error NT_SHARING_VIOLATION to EBUSY instead. The patch also replaces all instances of ETXTBSY in cifs_rename_pending_delete() with EBUSY.
The patch was a result of a user reporting a ETXTBSY error on performing an unlink operation caused by the server returning a NT_SHARING_VIOLATION.
--- fs/cifs/inode.c | 10 ++++------ fs/cifs/netmisc.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-)
fs/cifs/inode.c +4 -6
@@ -1034,7 +1034,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry, cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);if (rc !=0 ) { - rc = -ETXTBSY ; + rc = -EBUSY ; goto undo_setattr; }
@@ -1053,7 +1053,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,if (rc == -ENOENT ) rc =0 ;else if (rc !=0 ) { - rc = -ETXTBSY ; + rc = -EBUSY ; goto undo_rename; } cifsInode->delete_pending = true;
@@ -1160,15 +1160,13 @@ psx_del_no_retry:cifs_drop_nlink (inode); }else if (rc == -ENOENT ) {d_drop (dentry); - }else if (rc == -ETXTBSY ) { + }else if (rc == -EBUSY ) {if (server->ops->rename_pending_delete) { rc = server->ops->rename_pending_delete (full_path, dentry, xid);if (rc ==0 )cifs_drop_nlink (inode); } -if (rc == -ETXTBSY ) - rc = -EBUSY ; }else if ((rc == -EACCES ) && (dosattr ==0 ) && inode) { attrs =kzalloc (sizeof (*attrs),GFP_KERNEL );if (attrs ==NULL ) {
@@ -1509,7 +1507,7 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry,* source. Note that cross directory moves do not work with * rename by filehandle to various Windows servers. */ -if (rc ==0 || rc != -ETXTBSY ) +if (rc ==0 || rc != -EBUSY ) goto do_rename_exit;/* open-file renames don't work across directories */
fs/cifs/netmisc.c +1 -1
@@ -62,7 +62,7 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = { {ERRdiffdevice, -EXDEV}, {ERRnofiles, -ENOENT}, {ERRwriteprot, -EROFS}, - {ERRbadshare, -ETXTBSY}, + {ERRbadshare, -EBUSY}, {ERRlock, -EACCES}, {ERRunsup, -EINVAL}, {ERRnosuchshare, -ENXIO},
Signature · 1 line
1.7.11.7
A message that is not in the archive (sent off-list or not yet received): 1363697464-7564-1-git-send-email-sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Jeff Layton
Reviewed-byQuoted 70 lines · On Tue, 19 Mar 2013 12:51:04 +0000 Sachin Prabhu…
NT_SHARING_VIOLATIONerrors are mapped to ETXTBSY which is unexpected for operations such as unlink where we can hit these errors.The patch maps the error
NT_SHARING_VIOLATIONto EBUSY instead. The patch also replaces all instances of ETXTBSY incifs_rename_pending_delete()with EBUSY.The patch was a result of a user reporting a ETXTBSY error on performing an unlink operation caused by the server returning a
NT_SHARING_VIOLATION.Signed-off-by Sachin Prabhu <[email protected]>--- fs/cifs/inode.c | 10 ++++------ fs/cifs/netmisc.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-)fs/cifs/inode.c +4
-6@@ -1034,7 +1034,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry, cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);if (rc !=0 ) { - rc = -ETXTBSY ; + rc = -EBUSY ; goto undo_setattr; }@@ -1053,7 +1053,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,if (rc == -ENOENT ) rc =0 ;else if (rc !=0 ) { - rc = -ETXTBSY ; + rc = -EBUSY ; goto undo_rename; } cifsInode->delete_pending = true;@@ -1160,15 +1160,13 @@ psx_del_no_retry:cifs_drop_nlink (inode); }else if (rc == -ENOENT ) {d_drop (dentry); - }else if (rc == -ETXTBSY ) { + }else if (rc == -EBUSY ) {if (server->ops->rename_pending_delete) { rc = server->ops->rename_pending_delete (full_path, dentry, xid);if (rc ==0 )cifs_drop_nlink (inode); } -if (rc == -ETXTBSY ) - rc = -EBUSY ; }else if ((rc == -EACCES ) && (dosattr ==0 ) && inode) { attrs =kzalloc (sizeof (*attrs),GFP_KERNEL );if (attrs ==NULL ) {@@ -1509,7 +1507,7 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry,* source. Note that cross directory moves do not work with * rename by filehandle to various Windows servers. */ -if (rc ==0 || rc != -ETXTBSY ) +if (rc ==0 || rc != -EBUSY ) goto do_rename_exit;/* open-file renames don't work across directories */ fs/cifs/netmisc.c +0
-0
fs/cifs/netmisc.c static const struct smb_to_posix_error mapping_table_ERRDOS[] = { · line 68
Quoted 8 lines
fs/cifs/netmisc.c +1
-1@@ -62,7 +62,7 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = { {ERRdiffdevice, -EXDEV}, {ERRnofiles, -ENOENT}, {ERRwriteprot, -EROFS}, - {ERRbadshare, -ETXTBSY}, + {ERRbadshare, -EBUSY}, {ERRlock, -EACCES}, {ERRunsup, -EINVAL}, {ERRnosuchshare, -ENXIO},
Looks correct to me.