P6.X sq SMB_VFS_IO_READ_SEND flags

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 1e5c73212902764aa26f9c95df7fc61fbbbd43fe..42fb872081eabaec4beb0f9632361463e3011a62 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -298,6 +298,7 @@ static struct tevent_req *skel_io_read_send(struct vfs_handle_struct *handle,
                                            TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct files_struct *fsp,
+                                           uint32_t flags,
                                            struct smb_vfs_io *io,
                                            size_t n, off_t offset)
 {

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index d6252abe9f69e1ae2b20658066683fa44fc840fe..ac14f8414d44be566cc05941a9b5c0f72a54643b 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -391,6 +391,7 @@ static struct tevent_req *skel_io_read_send(struct vfs_handle_struct *handle,
                                            TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct files_struct *fsp,
+                                           uint32_t flags,
                                            struct smb_vfs_io *io,
                                            size_t n, off_t offset)
 {
@@ -402,7 +403,7 @@ static struct tevent_req *skel_io_read_send(struct vfs_handle_struct *handle,
                return NULL;
        }
        subreq = SMB_VFS_NEXT_IO_READ_SEND(state, ev, handle, fsp,
-                                          io, n, offset);
+                                          flags, io, n, offset);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 84eec2421a7a14bd3c972f14451dcc407a88ed88..86d9d0c5b31ac0ee9f7bd216e9c3d0b6113ee33d 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -1030,6 +1030,7 @@ struct vfs_fn_pointers {
                                              TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
                                              struct files_struct *fsp,
+                                             uint32_t flags,
                                              struct smb_vfs_io *io,
                                              size_t n, off_t offset);
        ssize_t (*io_read_recv_fn)(struct tevent_req *req, struct vfs_aio_state *state);
@@ -1553,6 +1554,7 @@ struct tevent_req *smb_vfs_call_io_read_send(struct vfs_handle_struct *handle,
                                             TALLOC_CTX *mem_ctx,
                                             struct tevent_context *ev,
                                             struct files_struct *fsp,
+                                            uint32_t flags,
                                             struct smb_vfs_io *io,
                                             size_t n, off_t offset);
 ssize_t SMB_VFS_IO_READ_RECV(struct tevent_req *req, struct vfs_aio_state *state);
@@ -1996,6 +1998,7 @@ struct tevent_req *vfs_not_implemented_io_read_send(struct vfs_handle_struct *ha
                                                    TALLOC_CTX *mem_ctx,
                                                    struct tevent_context *ev,
                                                    struct files_struct *fsp,
+                                                   uint32_t flags,
                                                    struct smb_vfs_io *io,
                                                    size_t n, off_t offset);
 ssize_t vfs_not_implemented_io_read_recv(struct tevent_req *req,

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 580693b705987a35eaee53534803d20bc2b04ee9..34bd3f0048d7c3de4bb04dc842864ddbdac0c5e8 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -167,12 +167,12 @@
        smb_vfs_call_pread_send((handle)->next, (mem_ctx), (ev), (fsp), \
                                (data), (n), (off))
 
-#define SMB_VFS_IO_READ_SEND(mem_ctx, ev, fsp, io, n, off) \
+#define SMB_VFS_IO_READ_SEND(mem_ctx, ev, fsp, flags, io, n, off) \
        smb_vfs_call_io_read_send((fsp)->conn->vfs_handles, (mem_ctx), (ev), \
-                                 (fsp), (io), (n), (off))
-#define SMB_VFS_NEXT_IO_READ_SEND(mem_ctx, ev, handle, fsp, io, n, off)        \
+                                 (fsp), (flags), (io), (n), (off))
+#define SMB_VFS_NEXT_IO_READ_SEND(mem_ctx, ev, handle, fsp, flags, io, n, off) \
        smb_vfs_call_io_read_send((handle)->next, (mem_ctx), (ev), (fsp), \
-                                 (io), (n), (off))
+                                 (flags), (io), (n), (off))
 
 #define SMB_VFS_PWRITE(fsp, data, n, off) \
        smb_vfs_call_pwrite((fsp)->conn->vfs_handles, (fsp), (data), (n), (off))

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index 93bf3ed8552f17968f066df47389aa56c137cd87..a35cf04472fd696cac53f711808588ca3cb6945a 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -326,6 +326,7 @@ struct tevent_req *vfs_not_implemented_io_read_send(struct vfs_handle_struct *ha
                                                    TALLOC_CTX *mem_ctx,
                                                    struct tevent_context *ev,
                                                    struct files_struct *fsp,
+                                                   uint32_t flags,
                                                    struct smb_vfs_io *io,
                                                    size_t n, off_t offset)
 {

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 6965d0ae2467b96f512b1cc30e57e1a1fb21be75..8b6f9bcf21f60ed682905d9c9ebbc194c61be3e1 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1946,6 +1946,7 @@ struct tevent_req *smb_vfs_call_io_read_send(struct vfs_handle_struct *handle,
                                             TALLOC_CTX *mem_ctx,
                                             struct tevent_context *ev,
                                             struct files_struct *fsp,
+                                            uint32_t flags,
                                             struct smb_vfs_io *io,
                                             size_t n, off_t offset)
 {
@@ -1961,7 +1962,7 @@ struct tevent_req *smb_vfs_call_io_read_send(struct vfs_handle_struct *handle,
        state->recv_fn = handle->fns->io_read_recv_fn;
 
        subreq = handle->fns->io_read_send_fn(handle, state, ev, fsp,
-                                             io, n, offset);
+                                             flags, io, n, offset);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }