Changeset 745 for trunk/server/source3/smbd/smb2_write.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/smb2_write.c (modified) (9 diffs)

trunk/server/source3/smbd/smb2_write.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "rpc_server/srv_pipe_hnd.h"
 
 static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
@@ -82 +85 @@
 
         /* check the max write size */
-        if (in_data_length > 0x00010000) {
-                DEBUG(0,("here:%s: 0x%08X: 0x%08X\n",
-                        __location__, in_data_length, 0x00010000));
+        if (in_data_length > lp_smb2_max_write()) {
+                /* This is a warning. */
+                DEBUG(2,("smbd_smb2_request_process_write : "
+                        "client ignored max write :%s: 0x%08X: 0x%08X\n",
+                        __location__, in_data_length, lp_smb2_max_write()));
+#if 0
                 return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+#endif
         }
 
@@ -93 +100 @@
         if (req->compat_chain_fsp) {
                 /* skip check */
-        } else if (in_file_id_persistent != 0) {
+        } else if (in_file_id_persistent != in_file_id_volatile) {
                 return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
         }
@@ -168 +175 @@
 struct smbd_smb2_write_state {
         struct smbd_smb2_request *smb2req;
+        files_struct *fsp;
+        bool write_through;
         uint32_t in_length;
+        uint64_t in_offset;
         uint32_t out_count;
 };
 
 static void smbd_smb2_write_pipe_done(struct tevent_req *subreq);
+
+NTSTATUS smb2_write_complete(struct tevent_req *req, ssize_t nwritten, int err)
+{
+        NTSTATUS status;
+        struct smbd_smb2_write_state *state = tevent_req_data(req,
+                                        struct smbd_smb2_write_state);
+        files_struct *fsp = state->fsp;
+
+        DEBUG(3,("smb2: fnum=[%d/%s] "
+                "length=%lu offset=%lu wrote=%lu\n",
+                fsp->fnum,
+                fsp_str_dbg(fsp),
+                (unsigned long)state->in_length,
+                (unsigned long)state->in_offset,
+                (unsigned long)nwritten));
+
+        if (nwritten == -1) {
+                return map_nt_error_from_unix(err);
+        }
+
+        if ((nwritten == 0) && (state->in_length != 0)) {
+                DEBUG(5,("smb2: write [%s] disk full\n",
+                        fsp_str_dbg(fsp)));
+                return NT_STATUS_DISK_FULL;
+        }
+
+        status = sync_file(fsp->conn, fsp, state->write_through);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(5,("smb2: sync_file for %s returned %s\n",
+                        fsp_str_dbg(fsp),
+                        nt_errstr(status)));
+                return status;
+        }
+
+        state->out_count = nwritten;
+
+        return NT_STATUS_OK;
+}
 
 static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
@@ -184 +232 @@
 {
         NTSTATUS status;
-        struct tevent_req *req;
-        struct smbd_smb2_write_state *state;
-        struct smb_request *smbreq;
+        struct tevent_req *req = NULL;
+        struct smbd_smb2_write_state *state = NULL;
+        struct smb_request *smbreq = NULL;
         connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp;
+        files_struct *fsp = NULL;
         ssize_t nwritten;
-        bool write_through = false;
         struct lock_struct lock;
 
@@ -199 +246 @@
         }
         state->smb2req = smb2req;
+        if (in_flags & 0x00000001) {
+                state->write_through = true;
+        }
         state->in_length = in_data.length;
         state->out_count = 0;
@@ -224 +274 @@
         }
 
+        state->fsp = fsp;
+
         if (IS_IPC(smbreq->conn)) {
-                struct tevent_req *subreq;
+                struct tevent_req *subreq = NULL;
 
                 if (!fsp_is_np(fsp)) {
@@ -250 +302 @@
         }
 
+        /* Try and do an asynchronous write. */
+        status = schedule_aio_smb2_write(conn,
+                                        smbreq,
+                                        fsp,
+                                        in_offset,
+                                        in_data,
+                                        state->write_through);
+
+        if (NT_STATUS_IS_OK(status)) {
+                /*
+                 * Doing an async write. Don't
+                 * send a "gone async" message
+                 * as we expect this to be less
+                 * than the client timeout period.
+                 * JRA. FIXME for offline files..
+                 * FIXME - add cancel code..
+                 */
+                smb2req->async = true;
+                return req;
+        }
+
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
+                /* Real error in setting up aio. Fail. */
+                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+                return tevent_req_post(req, ev);
+        }
+
+        /* Fallback to synchronous. */
         init_strict_lock_struct(fsp,
-                                in_smbpid,
+                                in_file_id_volatile,
                                 in_offset,
                                 in_data.length,
@@ -267 +347 @@
                               in_data.length);
 
-        if (((nwritten == 0) && (in_data.length != 0)) || (nwritten < 0)) {
-                DEBUG(5,("smbd_smb2_write: write_file[%s] disk full\n",
-                         fsp_str_dbg(fsp)));
-                SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
-                tevent_req_nterror(req, NT_STATUS_DISK_FULL);
-                return tevent_req_post(req, ev);
-        }
-
-        DEBUG(3,("smbd_smb2_write: fnum=[%d/%s] length=%d offset=%d wrote=%d\n",
-                fsp->fnum, fsp_str_dbg(fsp), (int)in_data.length,
-                (int)in_offset, (int)nwritten));
-
-        if (in_flags & 0x00000001) {
-                write_through = true;
-        }
-
-        status = sync_file(conn, fsp, write_through);
+        status = smb2_write_complete(req, nwritten, errno);
+
+        SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
+        DEBUG(10,("smb2: write on "
+                "file %s, offset %.0f, requested %u, written = %u\n",
+                fsp_str_dbg(fsp),
+                (double)in_offset,
+                (unsigned int)in_data.length,
+                (unsigned int)nwritten ));
+
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(5,("smbd_smb2_write: sync_file for %s returned %s\n",
-                        fsp_str_dbg(fsp), nt_errstr(status)));
-                SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
                 tevent_req_nterror(req, status);
-                return tevent_req_post(req, ev);
-        }
-
-        SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
-
-        state->out_count = nwritten;
-
-        tevent_req_done(req);
+        } else {
+                /* Success. */
+                tevent_req_done(req);
+        }
+
         return tevent_req_post(req, ev);
 }