r23792: convert Samba4 to GPLv3

[bbaumbach/samba-autobuild/.git] / source4 / ntvfs / posix / pvfs_write.c

diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c
index ccf3a775a82f28943192a93fe4f6f6dc75dedd19..5a11f01952bb19e4f91524b02315b82cf1c9837d 100644 (file)
--- a/source4/ntvfs/posix/pvfs_write.c
+++ b/source4/ntvfs/posix/pvfs_write.c
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,19 +16,19 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "vfs_posix.h"
+#include "librpc/gen_ndr/security.h"
 
 
 /*
   write to a file
 */
 NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs,
-                   struct smbsrv_request *req, union smb_write *wr)
+                   struct ntvfs_request *req, union smb_write *wr)
 {
        struct pvfs_state *pvfs = ntvfs->private_data;
        ssize_t ret;
@@ -36,45 +36,61 @@ NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs,
        NTSTATUS status;
 
        if (wr->generic.level != RAW_WRITE_WRITEX) {
-               return ntvfs_map_write(req, wr, ntvfs);
+               return ntvfs_map_write(ntvfs, req, wr);
        }
 
-       f = pvfs_find_fd(pvfs, req, wr->writex.in.fnum);
+       f = pvfs_find_fd(pvfs, req, wr->writex.in.file.ntvfs);
        if (!f) {
                return NT_STATUS_INVALID_HANDLE;
        }
 
-       if (f->name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) {
+       if (f->handle->fd == -1) {
                return NT_STATUS_FILE_IS_A_DIRECTORY;
        }
 
-       if (!(f->access_mask & SA_RIGHT_FILE_WRITE_APPEND)) {
-               return NT_STATUS_ACCESS_VIOLATION;
+       if (!(f->access_mask & (SEC_FILE_WRITE_DATA | SEC_FILE_APPEND_DATA))) {
+               return NT_STATUS_ACCESS_DENIED;
        }
 
        status = pvfs_check_lock(pvfs, f, req->smbpid, 
                                 wr->writex.in.offset,
                                 wr->writex.in.count,
                                 WRITE_LOCK);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
+       NT_STATUS_NOT_OK_RETURN(status);
        
-       ret = pwrite(f->fd, 
-                    wr->writex.in.data, 
-                    wr->writex.in.count,
-                    wr->writex.in.offset);
+       if (f->handle->name->stream_name) {
+               ret = pvfs_stream_write(pvfs,
+                                       f->handle,
+                                       wr->writex.in.data, 
+                                       wr->writex.in.count,
+                                       wr->writex.in.offset);
+       } else {
+#if HAVE_LINUX_AIO
+               /* possibly try an aio write */
+               if ((req->async_states->state & NTVFS_ASYNC_STATE_MAY_ASYNC) &&
+                   (pvfs->flags & PVFS_FLAG_LINUX_AIO)) {
+                       status = pvfs_aio_pwrite(req, wr, f);
+                       if (NT_STATUS_IS_OK(status)) {
+                               return NT_STATUS_OK;
+                       }
+               }
+#endif
+               ret = pwrite(f->handle->fd, 
+                            wr->writex.in.data, 
+                            wr->writex.in.count,
+                            wr->writex.in.offset);
+       }
        if (ret == -1) {
                if (errno == EFBIG) {
                        return NT_STATUS_INVALID_PARAMETER;
                }
-               return map_nt_error_from_unix(errno);
+               return pvfs_map_errno(pvfs, errno);
        }
 
-       f->seek_offset = wr->writex.in.offset + ret;
+       f->handle->seek_offset = wr->writex.in.offset + ret;
        
        wr->writex.out.nwritten = ret;
        wr->writex.out.remaining = 0; /* should fill this in? */
-       
+
        return NT_STATUS_OK;
 }