lkml.org 
[lkml]   [2015]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 053/123] disabling oplocks/leases via module parm enable_oplocks broken for SMB3
    Date
    From: Steve French <smfrench@gmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit e0ddde9d44e37fbc21ce893553094ecf1a633ab5 upstream.

    leases (oplocks) were always requested for SMB2/SMB3 even when oplocks
    disabled in the cifs.ko module.

    Signed-off-by: Steve French <steve.french@primarydata.com>
    Reviewed-by: Chandrika Srinivasan <chandrika.srinivasan@citrix.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    fs/cifs/smb2ops.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
    index 6f79cd867a2e..57519567b2ac 100644
    --- a/fs/cifs/smb2ops.c
    +++ b/fs/cifs/smb2ops.c
    @@ -49,9 +49,13 @@ change_conf(struct TCP_Server_Info *server)
    break;
    default:
    server->echoes = true;
    - server->oplocks = true;
    + if (enable_oplocks) {
    + server->oplocks = true;
    + server->oplock_credits = 1;
    + } else
    + server->oplocks = false;
    +
    server->echo_credits = 1;
    - server->oplock_credits = 1;
    }
    server->credits -= server->echo_credits + server->oplock_credits;
    return 0;
    --
    2.6.2


    \
     
     \ /
      Last update: 2015-10-28 15:41    [W:3.118 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site