From 86497db6113c4ec3210d671c3fcf957d1026098c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 10 Mar 2006 14:31:17 +0000 Subject: r14157: - pass a struct ntvfs_request to the ntvfs layer (for now we just do #define ntvfs_request smbsrv_request, but it's the first step...) - rename ntvfs_openfile() -> ntvfs_open() - fix the talloc hierachie in some places in the ntvfs_map_*() code metze (This used to be commit ed9ed1f48f602354810937c0b0de850b44322191) --- source4/smb_server/smb/nttrans.c | 2 +- source4/smb_server/smb/reply.c | 12 ++++++------ source4/smb_server/smb/trans2.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/smb_server/smb') diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c index 3d898ba1a7..b105932386 100644 --- a/source4/smb_server/smb/nttrans.c +++ b/source4/smb_server/smb/nttrans.c @@ -187,7 +187,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req, op->send_fn = nttrans_create_send; op->op_info = io; - return ntvfs_openfile(req, io); + return ntvfs_open(req, io); } diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c index db4580bf5a..93697afd4a 100644 --- a/source4/smb_server/smb/reply.c +++ b/source4/smb_server/smb/reply.c @@ -446,7 +446,7 @@ void smbsrv_reply_open(struct smbsrv_request *req) req->async_states->private_data = oi; /* call backend */ - req->async_states->status = ntvfs_openfile(req, oi); + req->async_states->status = ntvfs_open(req, oi); REQ_ASYNC_TAIL; } @@ -524,7 +524,7 @@ void smbsrv_reply_open_and_X(struct smbsrv_request *req) req->async_states->private_data = oi; /* call the backend */ - req->async_states->status = ntvfs_openfile(req, oi); + req->async_states->status = ntvfs_open(req, oi); REQ_ASYNC_TAIL; } @@ -579,7 +579,7 @@ void smbsrv_reply_mknew(struct smbsrv_request *req) req->async_states->private_data = oi; /* call the backend */ - req->async_states->status = ntvfs_openfile(req, oi); + req->async_states->status = ntvfs_open(req, oi); REQ_ASYNC_TAIL; } @@ -633,7 +633,7 @@ void smbsrv_reply_ctemp(struct smbsrv_request *req) req->async_states->private_data = oi; /* call the backend */ - req->async_states->status = ntvfs_openfile(req, oi); + req->async_states->status = ntvfs_open(req, oi); REQ_ASYNC_TAIL; } @@ -1442,7 +1442,7 @@ void smbsrv_reply_printopen(struct smbsrv_request *req) req->async_states->private_data = oi; /* call backend */ - req->async_states->status = ntvfs_openfile(req, oi); + req->async_states->status = ntvfs_open(req, oi); REQ_ASYNC_TAIL; } @@ -2328,7 +2328,7 @@ void smbsrv_reply_ntcreate_and_X(struct smbsrv_request *req) req->async_states->private_data = io; /* call the backend */ - req->async_states->status = ntvfs_openfile(req, io); + req->async_states->status = ntvfs_open(req, io); REQ_ASYNC_TAIL; } diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index be14961082..ed53ce4daf 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -452,7 +452,7 @@ static NTSTATUS trans2_open(struct smbsrv_request *req, struct smb_trans2 *trans return status; } - status = ntvfs_openfile(req, io); + status = ntvfs_open(req, io); if (!NT_STATUS_IS_OK(status)) { return status; } -- cgit