selftest/Samba4: make use of get_cmd_env_vars() to setup all relevant env variables

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

diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index aa9c87db74d1928541349d837d7b278346e3055f..355edeac13aaf2bb72804bae98807d4c0e61c0c4 100644 (file)
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -45,7 +45,7 @@
  *                          size of the file before transferring it. With this
  *                          option, we remember that hint, and commit after
  *                          writing in that file position. If the client
- *                          doesn't declare the size of file, commiting on EOF 
+ *                          doesn't declare the size of file, committing on EOF
  *                          is not triggered.
  *
  *          = growth        Commits after a write operation has made the file
@@ -86,9 +86,9 @@ static int commit_do(
                ("%s: flushing %lu dirty bytes\n",
                 MODULE, (unsigned long)c->dbytes));
 
-#if HAVE_FDATASYNC
+#if defined(HAVE_FDATASYNC)
         result = fdatasync(fd);
-#elif HAVE_FSYNC
+#elif defined(HAVE_FSYNC)
         result = fsync(fd);
 #else
        DEBUG(0, ("%s: WARNING: no commit support on this platform\n",
@@ -113,7 +113,7 @@ static int commit_all(
                                 ("%s: flushing %lu dirty bytes\n",
                                  MODULE, (unsigned long)c->dbytes));
 
-                        return commit_do(c, fsp->fh->fd);
+                        return commit_do(c, fsp_get_io_fd(fsp));
                 }
         }
         return 0;
@@ -135,7 +135,7 @@ static int commit(
        c->dbytes += last_write;        /* dirty bytes always counted */
 
        if (c->dthresh && (c->dbytes > c->dthresh)) {
-               return commit_do(c, fsp->fh->fd);
+               return commit_do(c, fsp_get_io_fd(fsp));
        }
 
        /* Return if we are not in EOF mode or if we have temporarily opted
@@ -147,7 +147,7 @@ static int commit(
 
        /* This write hit or went past our cache the file size. */
        if ((offset + last_write) >= c->eof) {
-               if (commit_do(c, fsp->fh->fd) == -1) {
+               if (commit_do(c, fsp_get_io_fd(fsp)) == -1) {
                        return -1;
                }
 
@@ -177,12 +177,11 @@ static int commit_connect(
         return 0;
 }
 
-static int commit_open(
-       vfs_handle_struct * handle,
-       struct smb_filename *smb_fname,
-       files_struct *      fsp,
-       int                 flags,
-       mode_t              mode)
+static int commit_openat(struct vfs_handle_struct *handle,
+                        const struct files_struct *dirfsp,
+                        const struct smb_filename *smb_fname,
+                        files_struct *fsp,
+                        const struct vfs_open_how *how)
 {
         off_t dthresh;
        const char *eof_mode;
@@ -190,8 +189,12 @@ static int commit_open(
         int fd;
 
         /* Don't bother with read-only files. */
-        if ((flags & O_ACCMODE) == O_RDONLY) {
-                return SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
+        if ((how->flags & O_ACCMODE) == O_RDONLY) {
+                return SMB_VFS_NEXT_OPENAT(handle,
+                                          dirfsp,
+                                          smb_fname,
+                                          fsp,
+                                          how);
         }
 
         /* Read and check module configuration */
@@ -221,7 +224,7 @@ static int commit_open(
                 }
         }
 
-        fd = SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
+       fd = SMB_VFS_NEXT_OPENAT(handle, dirfsp, smb_fname, fsp, how);
        if (fd == -1) {
                VFS_REMOVE_FSP_EXTENSION(handle, fsp);
                return fd;
@@ -235,10 +238,11 @@ static int commit_open(
                 * but also practiced elsewhere -
                 * needed for calling the VFS.
                 */
-               fsp->fh->fd = fd;
+               fsp_set_fd(fsp, fd);
                if (SMB_VFS_FSTAT(fsp, &st) == -1) {
                        int saved_errno = errno;
                        SMB_VFS_CLOSE(fsp);
+                       fsp_set_fd(fsp, -1);
                        errno = saved_errno;
                         return -1;
                 }
@@ -248,24 +252,6 @@ static int commit_open(
         return fd;
 }
 
-static ssize_t commit_write(
-        vfs_handle_struct * handle,
-        files_struct *      fsp,
-        const void *        data,
-        size_t              count)
-{
-        ssize_t ret;
-        ret = SMB_VFS_NEXT_WRITE(handle, fsp, data, count);
-
-        if (ret > 0) {
-                if (commit(handle, fsp, fsp->fh->pos, ret) == -1) {
-                        return -1;
-                }
-        }
-
-        return ret;
-}
-
 static ssize_t commit_pwrite(
         vfs_handle_struct * handle,
         files_struct *      fsp,
@@ -340,7 +326,9 @@ static void commit_pwrite_written(struct tevent_req *subreq)
         * 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,
+       commit_ret = commit(state->handle,
+                           state->fsp,
+                           fh_get_pos(state->fsp->fh),
                            state->ret);
 
        if (commit_ret == -1) {
@@ -393,9 +381,8 @@ static int commit_ftruncate(
 }
 
 static struct vfs_fn_pointers vfs_commit_fns = {
-        .open_fn = commit_open,
+        .openat_fn = commit_openat,
         .close_fn = commit_close,
-        .write_fn = commit_write,
         .pwrite_fn = commit_pwrite,
         .pwrite_send_fn = commit_pwrite_send,
         .pwrite_recv_fn = commit_pwrite_recv,