diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-12 08:32:47 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-08-06 09:51:11 +0200 |
| commit | 3afdd77bea8457e74fcc1ff75b18dec564f10caa (patch) | |
| tree | d58047435571c95c757d3866abeaa641567ebf23 /source3/modules/vfs_default.c | |
| parent | 1d8e7a520f0a8b8cf8ce56729b4d0b11a3aa6122 (diff) | |
| download | samba-3afdd77bea8457e74fcc1ff75b18dec564f10caa.tar.gz samba-3afdd77bea8457e74fcc1ff75b18dec564f10caa.tar.xz samba-3afdd77bea8457e74fcc1ff75b18dec564f10caa.zip | |
s3:smbd: move libasys state from smbXsrv_connection to smbd_server_connection
This doesn't belong to a connection, it's state used within the VFS stack.
And smbd_server_connection is the legacy structure we're using for
global VFS state.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/modules/vfs_default.c')
| -rw-r--r-- | source3/modules/vfs_default.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 78c249d796..b8f4117fd1 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -650,7 +650,7 @@ static void vfswrap_asys_finished(struct tevent_context *ev, struct tevent_fd *fde, uint16_t flags, void *p); -static bool vfswrap_init_asys_ctx(struct smbXsrv_connection *conn) +static bool vfswrap_init_asys_ctx(struct smbd_server_connection *conn) { int ret; int fd; @@ -709,11 +709,11 @@ static struct tevent_req *vfswrap_pread_send(struct vfs_handle_struct *handle, if (req == NULL) { return NULL; } - if (!vfswrap_init_asys_ctx(handle->conn->sconn->conn)) { + if (!vfswrap_init_asys_ctx(handle->conn->sconn)) { tevent_req_oom(req); return tevent_req_post(req, ev); } - state->asys_ctx = handle->conn->sconn->conn->asys_ctx; + state->asys_ctx = handle->conn->sconn->asys_ctx; state->req = req; ret = asys_pread(state->asys_ctx, fsp->fh->fd, data, n, offset, req); @@ -741,11 +741,11 @@ static struct tevent_req *vfswrap_pwrite_send(struct vfs_handle_struct *handle, if (req == NULL) { return NULL; } - if (!vfswrap_init_asys_ctx(handle->conn->sconn->conn)) { + if (!vfswrap_init_asys_ctx(handle->conn->sconn)) { tevent_req_oom(req); return tevent_req_post(req, ev); } - state->asys_ctx = handle->conn->sconn->conn->asys_ctx; + state->asys_ctx = handle->conn->sconn->asys_ctx; state->req = req; ret = asys_pwrite(state->asys_ctx, fsp->fh->fd, data, n, offset, req); @@ -771,11 +771,11 @@ static struct tevent_req *vfswrap_fsync_send(struct vfs_handle_struct *handle, if (req == NULL) { return NULL; } - if (!vfswrap_init_asys_ctx(handle->conn->sconn->conn)) { + if (!vfswrap_init_asys_ctx(handle->conn->sconn)) { tevent_req_oom(req); return tevent_req_post(req, ev); } - state->asys_ctx = handle->conn->sconn->conn->asys_ctx; + state->asys_ctx = handle->conn->sconn->asys_ctx; state->req = req; ret = asys_fsync(state->asys_ctx, fsp->fh->fd, req); |