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-8495 Panic after SMB flush on a named pipe
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
SMB-122 smbd core dumps in smbd_dc_update / smb_log
SMB-117 Win7 fails to open security properties
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,11 +8,11 @@
  * source.  A copy of the CDDL is also available via the Internet at
  * http://www.illumos.org/license/CDDL.
  */
 
 /*
- * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2016 Syneto S.R.L. All rights reserved.
  */
 
 /*
  * Dispatch function for SMB2_FLUSH

@@ -30,32 +30,39 @@
         smb2fid_t smb2fid;
         uint32_t status;
         int rc = 0;
 
         /*
-         * SMB2 Flush request
+         * Decode SMB2 Flush request
          */
         rc = smb_mbc_decodef(
             &sr->smb_data, "wwlqq",
             &StructSize,                /* w */
             &reserved1,                 /* w */
             &reserved2,                 /* l */
             &smb2fid.persistent,        /* q */
             &smb2fid.temporal);         /* q */
-        if (rc)
+        if (rc || StructSize != 24)
                 return (SDRC_ERROR);
-        if (StructSize != 24)
-                return (SDRC_ERROR);
 
+        /*
+         * Want FID lookup before the start probe.
+         */
         status = smb2sr_lookup_fid(sr, &smb2fid);
+        DTRACE_SMB2_START(op__Flush, smb_request_t *, sr);
+
+        if (status == 0)
+                smb_ofile_flush(sr, sr->fid_ofile);
+
+        sr->smb2_status = status;
+        DTRACE_SMB2_DONE(op__Flush, smb_request_t *, sr);
+
         if (status) {
                 smb2sr_put_error(sr, status);
                 return (SDRC_SUCCESS);
         }
 
-        smb_ofile_flush(sr, sr->fid_ofile);
-
         /*
          * SMB2 Flush reply
          */
         (void) smb_mbc_encodef(
             &sr->reply, "wwl",