lkml.org 
[lkml]   [2014]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 138/187] CIFS: Fix STATUS_CANNOT_DELETE error mapping for SMB2
    Date
    3.13.11.7 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Pavel Shilovsky <pshilovsky@samba.org>

    commit 21496687a79424572f46a84c690d331055f4866f upstream.

    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.

    Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
    Signed-off-by: Steve French <smfrench@gmail.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/cifs/smb2maperror.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c
    index 94bd4fb..e31a9df 100644
    --- a/fs/cifs/smb2maperror.c
    +++ b/fs/cifs/smb2maperror.c
    @@ -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"},
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-09-16 00:21    [W:3.997 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site