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)
        
*** 8,18 ****
   * source.  A copy of the CDDL is also available via the Internet at
   * http://www.illumos.org/license/CDDL.
   */
  
  /*
!  * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
   */
  
  /*
   * Dispatch function for SMB2_TREE_DISCONNECT
   */
--- 8,18 ----
   * source.  A copy of the CDDL is also available via the Internet at
   * http://www.illumos.org/license/CDDL.
   */
  
  /*
!  * Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
   */
  
  /*
   * Dispatch function for SMB2_TREE_DISCONNECT
   */
*** 36,51 ****
          if (rc)
                  return (SDRC_ERROR);
          if (StructSize != 4)
                  return (SDRC_ERROR);
  
!         if (sr->uid_user == NULL || sr->tid_tree == NULL)
!                 return (SDRC_ERROR);
  
!         smb_session_cancel_requests(sr->session, sr->tid_tree, sr);
          smb_tree_disconnect(sr->tid_tree, B_TRUE);
  
          /*
           * SMB2 Tree Disconnect reply
           */
          (void) smb_mbc_encodef(
              &sr->reply, "wwl",
--- 36,54 ----
          if (rc)
                  return (SDRC_ERROR);
          if (StructSize != 4)
                  return (SDRC_ERROR);
  
!         /* Dispatch makes sure we have uid_user, tid_tree */
  
!         DTRACE_SMB2_START(op__TreeDisconnect, smb_request_t *, sr);
! 
          smb_tree_disconnect(sr->tid_tree, B_TRUE);
+         smb_session_cancel_requests(sr->session, sr->tid_tree, sr);
  
+         DTRACE_SMB2_DONE(op__TreeDisconnect, smb_request_t *, sr);
+ 
          /*
           * SMB2 Tree Disconnect reply
           */
          (void) smb_mbc_encodef(
              &sr->reply, "wwl",