Commit 21496687 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Fix STATUS_CANNOT_DELETE error mapping for SMB2 



The existing mapping causes unlink() call to return error after delete
operation. Changing the mapping to -EACCES makes the client process
the call like CIFS protocol does - reset dos attributes with ATTR_READONLY
flag masked off and retry the operation.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent b770ddfa

fs/cifs/smb2maperror.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { 
	{STATUS_MAPPED_FILE_SIZE_ZERO, -EIO, "STATUS_MAPPED_FILE_SIZE_ZERO"},

	{STATUS_TOO_MANY_OPENED_FILES, -EMFILE, "STATUS_TOO_MANY_OPENED_FILES"},

	{STATUS_CANCELLED, -EIO, "STATUS_CANCELLED"},

	{STATUS_CANNOT_DELETE, -EIO, "STATUS_CANNOT_DELETE"},

	{STATUS_CANNOT_DELETE, -EACCES, "STATUS_CANNOT_DELETE"},

	{STATUS_INVALID_COMPUTER_NAME, -EIO, "STATUS_INVALID_COMPUTER_NAME"},

	{STATUS_FILE_DELETED, -EIO, "STATUS_FILE_DELETED"},

	{STATUS_SPECIAL_ACCOUNT, -EIO, "STATUS_SPECIAL_ACCOUNT"},