Print this page
NEX-1643 dtrace provider for smbsrv
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
NEX-6041 Should pass the smbtorture lock tests
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
SMB-11 SMB2 message parse & dispatch
SMB-12 SMB2 Negotiate Protocol
SMB-13 SMB2 Session Setup
SMB-14 SMB2 Logoff
SMB-15 SMB2 Tree Connect
SMB-16 SMB2 Tree Disconnect
SMB-17 SMB2 Create
SMB-18 SMB2 Close
SMB-19 SMB2 Flush
SMB-20 SMB2 Read
SMB-21 SMB2 Write
SMB-22 SMB2 Lock/Unlock
SMB-23 SMB2 Ioctl
SMB-24 SMB2 Cancel
SMB-25 SMB2 Echo
SMB-26 SMB2 Query Dir
SMB-27 SMB2 Change Notify
SMB-28 SMB2 Query Info
SMB-29 SMB2 Set Info
SMB-30 SMB2 Oplocks
SMB-53 SMB2 Create Context options
(SMB2 code review cleanup 1, 2, 3)

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/smbsrv/smb2_tree_disconn.c
          +++ new/usr/src/uts/common/fs/smbsrv/smb2_tree_disconn.c
↓ open down ↓ 2 lines elided ↑ open up ↑
   3    3   * Common Development and Distribution License ("CDDL"), version 1.0.
   4    4   * You may only use this file in accordance with the terms of version
   5    5   * 1.0 of the CDDL.
   6    6   *
   7    7   * A full copy of the text of the CDDL should have accompanied this
   8    8   * source.  A copy of the CDDL is also available via the Internet at
   9    9   * http://www.illumos.org/license/CDDL.
  10   10   */
  11   11  
  12   12  /*
  13      - * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
       13 + * Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
  14   14   */
  15   15  
  16   16  /*
  17   17   * Dispatch function for SMB2_TREE_DISCONNECT
  18   18   */
  19   19  
  20   20  #include <smbsrv/smb2_kproto.h>
  21   21  
  22   22  smb_sdrc_t
  23   23  smb2_tree_disconn(smb_request_t *sr)
↓ open down ↓ 7 lines elided ↑ open up ↑
  31   31           */
  32   32          rc = smb_mbc_decodef(
  33   33              &sr->smb_data, "ww",
  34   34              &StructSize,                /* w */
  35   35              &reserved);                 /* w */
  36   36          if (rc)
  37   37                  return (SDRC_ERROR);
  38   38          if (StructSize != 4)
  39   39                  return (SDRC_ERROR);
  40   40  
  41      -        if (sr->uid_user == NULL || sr->tid_tree == NULL)
  42      -                return (SDRC_ERROR);
       41 +        /* Dispatch makes sure we have uid_user, tid_tree */
  43   42  
  44      -        smb_session_cancel_requests(sr->session, sr->tid_tree, sr);
       43 +        DTRACE_SMB2_START(op__TreeDisconnect, smb_request_t *, sr);
       44 +
  45   45          smb_tree_disconnect(sr->tid_tree, B_TRUE);
       46 +        smb_session_cancel_requests(sr->session, sr->tid_tree, sr);
  46   47  
       48 +        DTRACE_SMB2_DONE(op__TreeDisconnect, smb_request_t *, sr);
       49 +
  47   50          /*
  48   51           * SMB2 Tree Disconnect reply
  49   52           */
  50   53          (void) smb_mbc_encodef(
  51   54              &sr->reply, "wwl",
  52   55              4,  /* StructSize */        /* w */
  53   56              0); /* reserved */          /* w */
  54   57  
  55   58          return (SDRC_SUCCESS);
  56   59  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX