VFS: Modify opendir to take a const struct smb_filename * instead of const char *

[metze/samba/wip.git] / source3 / modules / vfs_commit.c

diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index cade1170bab445801c31959937710f6e385821c6..f1e2743b036fe045957762d598e4705e05622c05 100644 (file)
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -17,6 +17,9 @@
  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
+#include "lib/util/tevent_unix.h"
 
 /* Commit data module.
  *
@@ -66,11 +69,11 @@ enum eof_mode
 struct commit_info
 {
         /* For chunk-based commits */
-        SMB_OFF_T dbytes;      /* Dirty (uncommitted) bytes */
-        SMB_OFF_T dthresh;     /* Dirty data threshold */
+        off_t dbytes;  /* Dirty (uncommitted) bytes */
+        off_t dthresh; /* Dirty data threshold */
         /* For commits on EOF */
         enum eof_mode on_eof;
-        SMB_OFF_T eof;         /* Expected file size */
+        off_t eof;             /* Expected file size */
 };
 
 static int commit_do(
@@ -119,7 +122,7 @@ static int commit_all(
 static int commit(
         struct vfs_handle_struct *     handle,
         files_struct *                 fsp,
-       SMB_OFF_T                       offset,
+       off_t                   offset,
         ssize_t                                last_write)
 {
         struct commit_info *c;
@@ -181,7 +184,7 @@ static int commit_open(
        int                 flags,
        mode_t              mode)
 {
-        SMB_OFF_T dthresh;
+        off_t dthresh;
        const char *eof_mode;
         struct commit_info *c = NULL;
         int fd;
@@ -227,13 +230,22 @@ static int commit_open(
         /* EOF commit modes require us to know the initial file size. */
         if (c && (c->on_eof != EOF_NONE)) {
                 SMB_STRUCT_STAT st;
-                if (SMB_VFS_FSTAT(fsp, &st) == -1) {
+               /*
+                * Setting the fd of the FSP is a hack
+                * but also practiced elsewhere -
+                * needed for calling the VFS.
+                */
+               fsp->fh->fd = fd;
+               if (SMB_VFS_FSTAT(fsp, &st) == -1) {
+                       int saved_errno = errno;
+                       SMB_VFS_CLOSE(fsp);
+                       errno = saved_errno;
                         return -1;
                 }
                c->eof = st.st_ex_size;
         }
 
-        return 0;
+        return fd;
 }
 
 static ssize_t commit_write(
@@ -259,7 +271,7 @@ static ssize_t commit_pwrite(
         files_struct *      fsp,
         const void *        data,
         size_t              count,
-       SMB_OFF_T           offset)
+       off_t       offset)
 {
         ssize_t ret;
 
@@ -273,6 +285,83 @@ static ssize_t commit_pwrite(
         return ret;
 }
 
+struct commit_pwrite_state {
+       struct vfs_handle_struct *handle;
+       struct files_struct *fsp;
+       ssize_t ret;
+       int err;
+};
+
+static void commit_pwrite_written(struct tevent_req *subreq);
+
+static struct tevent_req *commit_pwrite_send(struct vfs_handle_struct *handle,
+                                            TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct files_struct *fsp,
+                                            const void *data,
+                                            size_t n, off_t offset)
+{
+       struct tevent_req *req, *subreq;
+       struct commit_pwrite_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct commit_pwrite_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->handle = handle;
+       state->fsp = fsp;
+
+       subreq = SMB_VFS_NEXT_PWRITE_SEND(state, ev, handle, fsp, data,
+                                         n, offset);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, commit_pwrite_written, req);
+       return req;
+}
+
+static void commit_pwrite_written(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct commit_pwrite_state *state = tevent_req_data(
+               req, struct commit_pwrite_state);
+       int commit_ret;
+
+       state->ret = SMB_VFS_PWRITE_RECV(subreq, &state->err);
+       TALLOC_FREE(subreq);
+
+       if (state->ret <= 0) {
+               tevent_req_done(req);
+               return;
+       }
+
+       /*
+        * Ok, this is a sync fake. We should make the sync async as well, but
+        * I'm too lazy for that right now -- vl
+        */
+       commit_ret = commit(state->handle, state->fsp, state->fsp->fh->pos,
+                           state->ret);
+
+       if (commit_ret == -1) {
+               state->ret = -1;
+       }
+
+       tevent_req_done(req);
+}
+
+static ssize_t commit_pwrite_recv(struct tevent_req *req, int *err)
+{
+       struct commit_pwrite_state *state =
+               tevent_req_data(req, struct commit_pwrite_state);
+
+       if (tevent_req_is_unix_error(req, err)) {
+               return -1;
+       }
+       *err = state->err;
+       return state->ret;
+}
+
 static int commit_close(
         vfs_handle_struct * handle,
         files_struct *      fsp)
@@ -285,7 +374,7 @@ static int commit_close(
 static int commit_ftruncate(
         vfs_handle_struct * handle,
         files_struct *      fsp,
-        SMB_OFF_T           len)
+        off_t           len)
 {
         int result;
 
@@ -303,12 +392,14 @@ static int commit_ftruncate(
 }
 
 static struct vfs_fn_pointers vfs_commit_fns = {
-        .open = commit_open,
+        .open_fn = commit_open,
         .close_fn = commit_close,
-        .write = commit_write,
-        .pwrite = commit_pwrite,
+        .write_fn = commit_write,
+        .pwrite_fn = commit_pwrite,
+        .pwrite_send_fn = commit_pwrite_send,
+        .pwrite_recv_fn = commit_pwrite_recv,
         .connect_fn = commit_connect,
-        .ftruncate = commit_ftruncate
+        .ftruncate_fn = commit_ftruncate
 };
 
 NTSTATUS vfs_commit_init(void);