r1280: rename struct request_context to smbsrv_request

metze
(This used to be commit a85d2db5826a84b812ea5162a11f54edd25f74e3)

12 files changed, 195 insertions, 195 deletions

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 6af8cd1878..b0389b9e59 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -38,7 +38,7 @@ struct cvfs_private {
 
 /* a structure used to pass information to an async handler */
 struct async_info {
-	struct request_context *req;
+	struct smbsrv_request *req;
 	void *parms;
 };
 
@@ -87,7 +87,7 @@ static void cifs_socket_handler(struct event_context *ev, struct fd_event *fde,
 /*
   connect to a share - used when a tree_connect operation comes in.
 */
-static NTSTATUS cvfs_connect(struct request_context *req, const char *sharename)
+static NTSTATUS cvfs_connect(struct smbsrv_request *req, const char *sharename)
 {
 	struct smbsrv_tcon *tcon = req->tcon;
 	NTSTATUS status;
@@ -149,7 +149,7 @@ static NTSTATUS cvfs_connect(struct request_context *req, const char *sharename)
 	   pointer in the operations structure */
 	if (private->map_calls && in_list("trans2", private->map_calls, True)) {
 		struct ntvfs_ops *ops = talloc_memdup(tcon->mem_ctx,tcon->ntvfs_ops,sizeof(*ops));
-		static NTSTATUS cvfs_trans2(struct request_context *,struct smb_trans2 *);
+		static NTSTATUS cvfs_trans2(struct smbsrv_request *,struct smb_trans2 *);
 		if (!ops) {
 			return NT_STATUS_NO_MEMORY;
 		}
@@ -195,7 +195,7 @@ static NTSTATUS cvfs_disconnect(struct smbsrv_tcon *tcon)
 static void async_simple(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = cli_request_simple_recv(c_req);
 	req->async.send_fn(req);
 }
@@ -223,7 +223,7 @@ static void async_simple(struct cli_request *c_req)
   delete a file - the dirtype specifies the file types to include in the search. 
   The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
 */
-static NTSTATUS cvfs_unlink(struct request_context *req, struct smb_unlink *unl)
+static NTSTATUS cvfs_unlink(struct smbsrv_request *req, struct smb_unlink *unl)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -245,7 +245,7 @@ static NTSTATUS cvfs_unlink(struct request_context *req, struct smb_unlink *unl)
 static void async_ioctl(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_ioctl_recv(c_req, req->mem_ctx, async->parms);
 	req->async.send_fn(req);
 }
@@ -253,7 +253,7 @@ static void async_ioctl(struct cli_request *c_req)
 /*
   ioctl interface
 */
-static NTSTATUS cvfs_ioctl(struct request_context *req, union smb_ioctl *io)
+static NTSTATUS cvfs_ioctl(struct smbsrv_request *req, union smb_ioctl *io)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -272,7 +272,7 @@ static NTSTATUS cvfs_ioctl(struct request_context *req, union smb_ioctl *io)
 /*
   check if a directory exists
 */
-static NTSTATUS cvfs_chkpath(struct request_context *req, struct smb_chkpath *cp)
+static NTSTATUS cvfs_chkpath(struct smbsrv_request *req, struct smb_chkpath *cp)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -292,7 +292,7 @@ static NTSTATUS cvfs_chkpath(struct request_context *req, struct smb_chkpath *cp
 static void async_qpathinfo(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_pathinfo_recv(c_req, req->mem_ctx, async->parms);
 	req->async.send_fn(req);
 }
@@ -300,7 +300,7 @@ static void async_qpathinfo(struct cli_request *c_req)
 /*
   return info on a pathname
 */
-static NTSTATUS cvfs_qpathinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS cvfs_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -320,7 +320,7 @@ static NTSTATUS cvfs_qpathinfo(struct request_context *req, union smb_fileinfo *
 static void async_qfileinfo(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_fileinfo_recv(c_req, req->mem_ctx, async->parms);
 	req->async.send_fn(req);
 }
@@ -328,7 +328,7 @@ static void async_qfileinfo(struct cli_request *c_req)
 /*
   query info on a open file
 */
-static NTSTATUS cvfs_qfileinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS cvfs_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -346,7 +346,7 @@ static NTSTATUS cvfs_qfileinfo(struct request_context *req, union smb_fileinfo *
 /*
   set info on a pathname
 */
-static NTSTATUS cvfs_setpathinfo(struct request_context *req, union smb_setfileinfo *st)
+static NTSTATUS cvfs_setpathinfo(struct smbsrv_request *req, union smb_setfileinfo *st)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -367,7 +367,7 @@ static NTSTATUS cvfs_setpathinfo(struct request_context *req, union smb_setfilei
 static void async_open(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_open_recv(c_req, req->mem_ctx, async->parms);
 	req->async.send_fn(req);
 }
@@ -375,7 +375,7 @@ static void async_open(struct cli_request *c_req)
 /*
   open a file
 */
-static NTSTATUS cvfs_open(struct request_context *req, union smb_open *io)
+static NTSTATUS cvfs_open(struct smbsrv_request *req, union smb_open *io)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -397,7 +397,7 @@ static NTSTATUS cvfs_open(struct request_context *req, union smb_open *io)
 /*
   create a directory
 */
-static NTSTATUS cvfs_mkdir(struct request_context *req, union smb_mkdir *md)
+static NTSTATUS cvfs_mkdir(struct smbsrv_request *req, union smb_mkdir *md)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -414,7 +414,7 @@ static NTSTATUS cvfs_mkdir(struct request_context *req, union smb_mkdir *md)
 /*
   remove a directory
 */
-static NTSTATUS cvfs_rmdir(struct request_context *req, struct smb_rmdir *rd)
+static NTSTATUS cvfs_rmdir(struct smbsrv_request *req, struct smb_rmdir *rd)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -430,7 +430,7 @@ static NTSTATUS cvfs_rmdir(struct request_context *req, struct smb_rmdir *rd)
 /*
   rename a set of files
 */
-static NTSTATUS cvfs_rename(struct request_context *req, union smb_rename *ren)
+static NTSTATUS cvfs_rename(struct smbsrv_request *req, union smb_rename *ren)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -447,7 +447,7 @@ static NTSTATUS cvfs_rename(struct request_context *req, union smb_rename *ren)
 /*
   copy a set of files
 */
-static NTSTATUS cvfs_copy(struct request_context *req, struct smb_copy *cp)
+static NTSTATUS cvfs_copy(struct smbsrv_request *req, struct smb_copy *cp)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -458,7 +458,7 @@ static NTSTATUS cvfs_copy(struct request_context *req, struct smb_copy *cp)
 static void async_read(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_read_recv(c_req, async->parms);
 	req->async.send_fn(req);
 }
@@ -466,7 +466,7 @@ static void async_read(struct cli_request *c_req)
 /*
   read from a file
 */
-static NTSTATUS cvfs_read(struct request_context *req, union smb_read *rd)
+static NTSTATUS cvfs_read(struct smbsrv_request *req, union smb_read *rd)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -486,7 +486,7 @@ static NTSTATUS cvfs_read(struct request_context *req, union smb_read *rd)
 static void async_write(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_write_recv(c_req, async->parms);
 	req->async.send_fn(req);
 }
@@ -494,7 +494,7 @@ static void async_write(struct cli_request *c_req)
 /*
   write to a file
 */
-static NTSTATUS cvfs_write(struct request_context *req, union smb_write *wr)
+static NTSTATUS cvfs_write(struct smbsrv_request *req, union smb_write *wr)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -511,7 +511,7 @@ static NTSTATUS cvfs_write(struct request_context *req, union smb_write *wr)
 /*
   seek in a file
 */
-static NTSTATUS cvfs_seek(struct request_context *req, struct smb_seek *io)
+static NTSTATUS cvfs_seek(struct smbsrv_request *req, struct smb_seek *io)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -519,7 +519,7 @@ static NTSTATUS cvfs_seek(struct request_context *req, struct smb_seek *io)
 /*
   flush a file
 */
-static NTSTATUS cvfs_flush(struct request_context *req, struct smb_flush *io)
+static NTSTATUS cvfs_flush(struct smbsrv_request *req, struct smb_flush *io)
 {
 	return NT_STATUS_OK;
 }
@@ -527,7 +527,7 @@ static NTSTATUS cvfs_flush(struct request_context *req, struct smb_flush *io)
 /*
   close a file
 */
-static NTSTATUS cvfs_close(struct request_context *req, union smb_close *io)
+static NTSTATUS cvfs_close(struct smbsrv_request *req, union smb_close *io)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -544,7 +544,7 @@ static NTSTATUS cvfs_close(struct request_context *req, union smb_close *io)
 /*
   exit - closing files?
 */
-static NTSTATUS cvfs_exit(struct request_context *req)
+static NTSTATUS cvfs_exit(struct smbsrv_request *req)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -552,7 +552,7 @@ static NTSTATUS cvfs_exit(struct request_context *req)
 /*
   lock a byte range
 */
-static NTSTATUS cvfs_lock(struct request_context *req, union smb_lock *lck)
+static NTSTATUS cvfs_lock(struct smbsrv_request *req, union smb_lock *lck)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -568,7 +568,7 @@ static NTSTATUS cvfs_lock(struct request_context *req, union smb_lock *lck)
 /*
   set info on a open file
 */
-static NTSTATUS cvfs_setfileinfo(struct request_context *req, 
+static NTSTATUS cvfs_setfileinfo(struct smbsrv_request *req, 
 				 union smb_setfileinfo *info)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
@@ -589,7 +589,7 @@ static NTSTATUS cvfs_setfileinfo(struct request_context *req,
 static void async_fsinfo(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_fsinfo_recv(c_req, req->mem_ctx, async->parms);
 	req->async.send_fn(req);
 }
@@ -597,7 +597,7 @@ static void async_fsinfo(struct cli_request *c_req)
 /*
   return filesystem space info
 */
-static NTSTATUS cvfs_fsinfo(struct request_context *req, union smb_fsinfo *fs)
+static NTSTATUS cvfs_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -614,7 +614,7 @@ static NTSTATUS cvfs_fsinfo(struct request_context *req, union smb_fsinfo *fs)
 /*
   return print queue info
 */
-static NTSTATUS cvfs_lpq(struct request_context *req, union smb_lpq *lpq)
+static NTSTATUS cvfs_lpq(struct smbsrv_request *req, union smb_lpq *lpq)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -622,7 +622,7 @@ static NTSTATUS cvfs_lpq(struct request_context *req, union smb_lpq *lpq)
 /* 
    list files in a directory matching a wildcard pattern
 */
-static NTSTATUS cvfs_search_first(struct request_context *req, union smb_search_first *io, 
+static NTSTATUS cvfs_search_first(struct smbsrv_request *req, union smb_search_first *io, 
 				  void *search_private, 
 				  BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -632,7 +632,7 @@ static NTSTATUS cvfs_search_first(struct request_context *req, union smb_search_
 }
 
 /* continue a search */
-static NTSTATUS cvfs_search_next(struct request_context *req, union smb_search_next *io, 
+static NTSTATUS cvfs_search_next(struct smbsrv_request *req, union smb_search_next *io, 
 				 void *search_private, 
 				 BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -642,7 +642,7 @@ static NTSTATUS cvfs_search_next(struct request_context *req, union smb_search_n
 }
 
 /* close a search */
-static NTSTATUS cvfs_search_close(struct request_context *req, union smb_search_close *io)
+static NTSTATUS cvfs_search_close(struct smbsrv_request *req, union smb_search_close *io)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 
@@ -655,13 +655,13 @@ static NTSTATUS cvfs_search_close(struct request_context *req, union smb_search_
 static void async_trans2(struct cli_request *c_req)
 {
 	struct async_info *async = c_req->async.private;
-	struct request_context *req = async->req;
+	struct smbsrv_request *req = async->req;
 	req->async.status = smb_raw_trans2_recv(c_req, req->mem_ctx, async->parms);
 	req->async.send_fn(req);
 }
 
 /* raw trans2 */
-static NTSTATUS cvfs_trans2(struct request_context *req, struct smb_trans2 *trans2)
+static NTSTATUS cvfs_trans2(struct smbsrv_request *req, struct smb_trans2 *trans2)
 {
 	struct cvfs_private *private = req->tcon->ntvfs_private;
 	struct cli_request *c_req;
@@ -677,7 +677,7 @@ static NTSTATUS cvfs_trans2(struct request_context *req, struct smb_trans2 *tran
 
 
 /* SMBtrans - not used on file shares */
-static NTSTATUS cvfs_trans(struct request_context *req, struct smb_trans2 *trans2)
+static NTSTATUS cvfs_trans(struct smbsrv_request *req, struct smb_trans2 *trans2)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index b726dd6116..8d3eaa2bb4 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -105,7 +105,7 @@ static struct pipe_state *pipe_state_find(struct ipc_private *private, uint16_t
 /*
   connect to a share - always works 
 */
-static NTSTATUS ipc_connect(struct request_context *req, const char *sharename)
+static NTSTATUS ipc_connect(struct smbsrv_request *req, const char *sharename)
 {
 	struct smbsrv_tcon *tcon = req->tcon;
 	struct ipc_private *private;
@@ -145,7 +145,7 @@ static NTSTATUS ipc_disconnect(struct smbsrv_tcon *tcon)
 /*
   delete a file
 */
-static NTSTATUS ipc_unlink(struct request_context *req, struct smb_unlink *unl)
+static NTSTATUS ipc_unlink(struct smbsrv_request *req, struct smb_unlink *unl)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -154,7 +154,7 @@ static NTSTATUS ipc_unlink(struct request_context *req, struct smb_unlink *unl)
 /*
   ioctl interface - we don't do any
 */
-static NTSTATUS ipc_ioctl(struct request_context *req, union smb_ioctl *io)
+static NTSTATUS ipc_ioctl(struct smbsrv_request *req, union smb_ioctl *io)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -162,7 +162,7 @@ static NTSTATUS ipc_ioctl(struct request_context *req, union smb_ioctl *io)
 /*
   check if a directory exists
 */
-static NTSTATUS ipc_chkpath(struct request_context *req, struct smb_chkpath *cp)
+static NTSTATUS ipc_chkpath(struct smbsrv_request *req, struct smb_chkpath *cp)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -170,7 +170,7 @@ static NTSTATUS ipc_chkpath(struct request_context *req, struct smb_chkpath *cp)
 /*
   return info on a pathname
 */
-static NTSTATUS ipc_qpathinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS ipc_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -178,7 +178,7 @@ static NTSTATUS ipc_qpathinfo(struct request_context *req, union smb_fileinfo *i
 /*
   set info on a pathname
 */
-static NTSTATUS ipc_setpathinfo(struct request_context *req, union smb_setfileinfo *st)
+static NTSTATUS ipc_setpathinfo(struct smbsrv_request *req, union smb_setfileinfo *st)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -188,7 +188,7 @@ static NTSTATUS ipc_setpathinfo(struct request_context *req, union smb_setfilein
 /*
   open a file backend - used for MSRPC pipes
 */
-static NTSTATUS ipc_open_generic(struct request_context *req, const char *fname, 
+static NTSTATUS ipc_open_generic(struct smbsrv_request *req, const char *fname, 
 				 struct pipe_state **ps)
 {
 	struct pipe_state *p;
@@ -270,7 +270,7 @@ static NTSTATUS ipc_open_generic(struct request_context *req, const char *fname,
 /*
   open a file with ntcreatex - used for MSRPC pipes
 */
-static NTSTATUS ipc_open_ntcreatex(struct request_context *req, union smb_open *oi)
+static NTSTATUS ipc_open_ntcreatex(struct smbsrv_request *req, union smb_open *oi)
 {
 	struct pipe_state *p;
 	NTSTATUS status;
@@ -290,7 +290,7 @@ static NTSTATUS ipc_open_ntcreatex(struct request_context *req, union smb_open *
 /*
   open a file with openx - used for MSRPC pipes
 */
-static NTSTATUS ipc_open_openx(struct request_context *req, union smb_open *oi)
+static NTSTATUS ipc_open_openx(struct smbsrv_request *req, union smb_open *oi)
 {
 	struct pipe_state *p;
 	NTSTATUS status;
@@ -318,7 +318,7 @@ static NTSTATUS ipc_open_openx(struct request_context *req, union smb_open *oi)
 /*
   open a file - used for MSRPC pipes
 */
-static NTSTATUS ipc_open(struct request_context *req, union smb_open *oi)
+static NTSTATUS ipc_open(struct smbsrv_request *req, union smb_open *oi)
 {
 	NTSTATUS status;
 
@@ -340,7 +340,7 @@ static NTSTATUS ipc_open(struct request_context *req, union smb_open *oi)
 /*
   create a directory
 */
-static NTSTATUS ipc_mkdir(struct request_context *req, union smb_mkdir *md)
+static NTSTATUS ipc_mkdir(struct smbsrv_request *req, union smb_mkdir *md)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -348,7 +348,7 @@ static NTSTATUS ipc_mkdir(struct request_context *req, union smb_mkdir *md)
 /*
   remove a directory
 */
-static NTSTATUS ipc_rmdir(struct request_context *req, struct smb_rmdir *rd)
+static NTSTATUS ipc_rmdir(struct smbsrv_request *req, struct smb_rmdir *rd)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -356,7 +356,7 @@ static NTSTATUS ipc_rmdir(struct request_context *req, struct smb_rmdir *rd)
 /*
   rename a set of files
 */
-static NTSTATUS ipc_rename(struct request_context *req, union smb_rename *ren)
+static NTSTATUS ipc_rename(struct smbsrv_request *req, union smb_rename *ren)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -364,7 +364,7 @@ static NTSTATUS ipc_rename(struct request_context *req, union smb_rename *ren)
 /*
   copy a set of files
 */
-static NTSTATUS ipc_copy(struct request_context *req, struct smb_copy *cp)
+static NTSTATUS ipc_copy(struct smbsrv_request *req, struct smb_copy *cp)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -372,7 +372,7 @@ static NTSTATUS ipc_copy(struct request_context *req, struct smb_copy *cp)
 /*
   read from a file
 */
-static NTSTATUS ipc_read(struct request_context *req, union smb_read *rd)
+static NTSTATUS ipc_read(struct smbsrv_request *req, union smb_read *rd)
 {
 	struct ipc_private *private = req->tcon->ntvfs_private;
 	DATA_BLOB data;
@@ -424,7 +424,7 @@ static NTSTATUS ipc_read(struct request_context *req, union smb_read *rd)
 /*
   write to a file
 */
-static NTSTATUS ipc_write(struct request_context *req, union smb_write *wr)
+static NTSTATUS ipc_write(struct smbsrv_request *req, union smb_write *wr)
 {
 	struct ipc_private *private = req->tcon->ntvfs_private;
 	DATA_BLOB data;
@@ -477,7 +477,7 @@ static NTSTATUS ipc_write(struct request_context *req, union smb_write *wr)
 /*
   seek in a file
 */
-static NTSTATUS ipc_seek(struct request_context *req, struct smb_seek *io)
+static NTSTATUS ipc_seek(struct smbsrv_request *req, struct smb_seek *io)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -485,7 +485,7 @@ static NTSTATUS ipc_seek(struct request_context *req, struct smb_seek *io)
 /*
   flush a file
 */
-static NTSTATUS ipc_flush(struct request_context *req, struct smb_flush *io)
+static NTSTATUS ipc_flush(struct smbsrv_request *req, struct smb_flush *io)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -493,7 +493,7 @@ static NTSTATUS ipc_flush(struct request_context *req, struct smb_flush *io)
 /*
   close a file
 */
-static NTSTATUS ipc_close(struct request_context *req, union smb_close *io)
+static NTSTATUS ipc_close(struct smbsrv_request *req, union smb_close *io)
 {
 	struct ipc_private *private = req->tcon->ntvfs_private;
 	struct pipe_state *p;
@@ -516,7 +516,7 @@ static NTSTATUS ipc_close(struct request_context *req, union smb_close *io)
 /*
   exit - closing files?
 */
-static NTSTATUS ipc_exit(struct request_context *req)
+static NTSTATUS ipc_exit(struct smbsrv_request *req)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -524,7 +524,7 @@ static NTSTATUS ipc_exit(struct request_context *req)
 /*
   lock a byte range
 */
-static NTSTATUS ipc_lock(struct request_context *req, union smb_lock *lck)
+static NTSTATUS ipc_lock(struct smbsrv_request *req, union smb_lock *lck)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -532,7 +532,7 @@ static NTSTATUS ipc_lock(struct request_context *req, union smb_lock *lck)
 /*
   set info on a open file
 */
-static NTSTATUS ipc_setfileinfo(struct request_context *req, union smb_setfileinfo *info)
+static NTSTATUS ipc_setfileinfo(struct smbsrv_request *req, union smb_setfileinfo *info)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -540,7 +540,7 @@ static NTSTATUS ipc_setfileinfo(struct request_context *req, union smb_setfilein
 /*
   query info on a open file
 */
-static NTSTATUS ipc_qfileinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS ipc_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -549,7 +549,7 @@ static NTSTATUS ipc_qfileinfo(struct request_context *req, union smb_fileinfo *i
 /*
   return filesystem info
 */
-static NTSTATUS ipc_fsinfo(struct request_context *req, union smb_fsinfo *fs)
+static NTSTATUS ipc_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -557,7 +557,7 @@ static NTSTATUS ipc_fsinfo(struct request_context *req, union smb_fsinfo *fs)
 /*
   return print queue info
 */
-static NTSTATUS ipc_lpq(struct request_context *req, union smb_lpq *lpq)
+static NTSTATUS ipc_lpq(struct smbsrv_request *req, union smb_lpq *lpq)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -565,7 +565,7 @@ static NTSTATUS ipc_lpq(struct request_context *req, union smb_lpq *lpq)
 /* 
    list files in a directory matching a wildcard pattern
 */
-NTSTATUS ipc_search_first(struct request_context *req, union smb_search_first *io,
+NTSTATUS ipc_search_first(struct smbsrv_request *req, union smb_search_first *io,
 			  void *search_private, 
 			  BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -575,7 +575,7 @@ NTSTATUS ipc_search_first(struct request_context *req, union smb_search_first *i
 /* 
    continue listing files in a directory 
 */
-NTSTATUS ipc_search_next(struct request_context *req, union smb_search_next *io,
+NTSTATUS ipc_search_next(struct smbsrv_request *req, union smb_search_next *io,
 			 void *search_private, 
 			 BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -585,14 +585,14 @@ NTSTATUS ipc_search_next(struct request_context *req, union smb_search_next *io,
 /* 
    end listing files in a directory 
 */
-NTSTATUS ipc_search_close(struct request_context *req, union smb_search_close *io)
+NTSTATUS ipc_search_close(struct smbsrv_request *req, union smb_search_close *io)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
 
 
 /* SMBtrans - handle a DCERPC command */
-static NTSTATUS ipc_dcerpc_cmd(struct request_context *req, struct smb_trans2 *trans)
+static NTSTATUS ipc_dcerpc_cmd(struct smbsrv_request *req, struct smb_trans2 *trans)
 {
 	struct pipe_state *p;
 	struct ipc_private *private = req->tcon->ntvfs_private;
@@ -637,7 +637,7 @@ static NTSTATUS ipc_dcerpc_cmd(struct request_context *req, struct smb_trans2 *t
 
 
 /* SMBtrans - set named pipe state */
-static NTSTATUS ipc_set_nm_pipe_state(struct request_context *req, struct smb_trans2 *trans)
+static NTSTATUS ipc_set_nm_pipe_state(struct smbsrv_request *req, struct smb_trans2 *trans)
 {
 	struct pipe_state *p;
 	struct ipc_private *private = req->tcon->ntvfs_private;
@@ -663,7 +663,7 @@ static NTSTATUS ipc_set_nm_pipe_state(struct request_context *req, struct smb_tr
 
 
 /* SMBtrans - used to provide access to SMB pipes */
-static NTSTATUS ipc_trans(struct request_context *req, struct smb_trans2 *trans)
+static NTSTATUS ipc_trans(struct smbsrv_request *req, struct smb_trans2 *trans)
 {
 	NTSTATUS status;
 
diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 5e9fd430cc..dceaa9f45b 100644
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -90,7 +90,7 @@ static void nbench_log(struct nbench_private *private,
 /*
   connect to a share - used when a tree_connect operation comes in.
 */
-static NTSTATUS nbench_connect(struct request_context *req, const char *sharename)
+static NTSTATUS nbench_connect(struct smbsrv_request *req, const char *sharename)
 {
 	struct nbench_private *private;
 	const char *passthru;
@@ -146,7 +146,7 @@ static NTSTATUS nbench_disconnect(struct smbsrv_tcon *tcon)
   delete a file - the dirtype specifies the file types to include in the search. 
   The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
 */
-static NTSTATUS nbench_unlink(struct request_context *req, struct smb_unlink *unl)
+static NTSTATUS nbench_unlink(struct smbsrv_request *req, struct smb_unlink *unl)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -163,7 +163,7 @@ static NTSTATUS nbench_unlink(struct request_context *req, struct smb_unlink *un
 /*
   ioctl interface
 */
-static NTSTATUS nbench_ioctl(struct request_context *req, union smb_ioctl *io)
+static NTSTATUS nbench_ioctl(struct smbsrv_request *req, union smb_ioctl *io)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -178,7 +178,7 @@ static NTSTATUS nbench_ioctl(struct request_context *req, union smb_ioctl *io)
 /*
   check if a directory exists
 */
-static NTSTATUS nbench_chkpath(struct request_context *req, struct smb_chkpath *cp)
+static NTSTATUS nbench_chkpath(struct smbsrv_request *req, struct smb_chkpath *cp)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -195,7 +195,7 @@ static NTSTATUS nbench_chkpath(struct request_context *req, struct smb_chkpath *
 /*
   return info on a pathname
 */
-static NTSTATUS nbench_qpathinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS nbench_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -213,7 +213,7 @@ static NTSTATUS nbench_qpathinfo(struct request_context *req, union smb_fileinfo
 /*
   query info on a open file
 */
-static NTSTATUS nbench_qfileinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS nbench_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -232,7 +232,7 @@ static NTSTATUS nbench_qfileinfo(struct request_context *req, union smb_fileinfo
 /*
   set info on a pathname
 */
-static NTSTATUS nbench_setpathinfo(struct request_context *req, union smb_setfileinfo *st)
+static NTSTATUS nbench_setpathinfo(struct smbsrv_request *req, union smb_setfileinfo *st)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -250,7 +250,7 @@ static NTSTATUS nbench_setpathinfo(struct request_context *req, union smb_setfil
 /*
   open a file
 */
-static NTSTATUS nbench_open(struct request_context *req, union smb_open *io)
+static NTSTATUS nbench_open(struct smbsrv_request *req, union smb_open *io)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -279,7 +279,7 @@ static NTSTATUS nbench_open(struct request_context *req, union smb_open *io)
 /*
   create a directory
 */
-static NTSTATUS nbench_mkdir(struct request_context *req, union smb_mkdir *md)
+static NTSTATUS nbench_mkdir(struct smbsrv_request *req, union smb_mkdir *md)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -294,7 +294,7 @@ static NTSTATUS nbench_mkdir(struct request_context *req, union smb_mkdir *md)
 /*
   remove a directory
 */
-static NTSTATUS nbench_rmdir(struct request_context *req, struct smb_rmdir *rd)
+static NTSTATUS nbench_rmdir(struct smbsrv_request *req, struct smb_rmdir *rd)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -311,7 +311,7 @@ static NTSTATUS nbench_rmdir(struct request_context *req, struct smb_rmdir *rd)
 /*
   rename a set of files
 */
-static NTSTATUS nbench_rename(struct request_context *req, union smb_rename *ren)
+static NTSTATUS nbench_rename(struct smbsrv_request *req, union smb_rename *ren)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -338,7 +338,7 @@ static NTSTATUS nbench_rename(struct request_context *req, union smb_rename *ren
 /*
   copy a set of files
 */
-static NTSTATUS nbench_copy(struct request_context *req, struct smb_copy *cp)
+static NTSTATUS nbench_copy(struct smbsrv_request *req, struct smb_copy *cp)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -353,7 +353,7 @@ static NTSTATUS nbench_copy(struct request_context *req, struct smb_copy *cp)
 /*
   read from a file
 */
-static NTSTATUS nbench_read(struct request_context *req, union smb_read *rd)
+static NTSTATUS nbench_read(struct smbsrv_request *req, union smb_read *rd)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -381,7 +381,7 @@ static NTSTATUS nbench_read(struct request_context *req, union smb_read *rd)
 /*
   write to a file
 */
-static NTSTATUS nbench_write(struct request_context *req, union smb_write *wr)
+static NTSTATUS nbench_write(struct smbsrv_request *req, union smb_write *wr)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -419,7 +419,7 @@ static NTSTATUS nbench_write(struct request_context *req, union smb_write *wr)
 /*
   seek in a file
 */
-static NTSTATUS nbench_seek(struct request_context *req, struct smb_seek *io)
+static NTSTATUS nbench_seek(struct smbsrv_request *req, struct smb_seek *io)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -434,7 +434,7 @@ static NTSTATUS nbench_seek(struct request_context *req, struct smb_seek *io)
 /*
   flush a file
 */
-static NTSTATUS nbench_flush(struct request_context *req, struct smb_flush *io)
+static NTSTATUS nbench_flush(struct smbsrv_request *req, struct smb_flush *io)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -451,7 +451,7 @@ static NTSTATUS nbench_flush(struct request_context *req, struct smb_flush *io)
 /*
   close a file
 */
-static NTSTATUS nbench_close(struct request_context *req, union smb_close *io)
+static NTSTATUS nbench_close(struct smbsrv_request *req, union smb_close *io)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -477,7 +477,7 @@ static NTSTATUS nbench_close(struct request_context *req, union smb_close *io)
 /*
   exit - closing files
 */
-static NTSTATUS nbench_exit(struct request_context *req)
+static NTSTATUS nbench_exit(struct smbsrv_request *req)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -490,7 +490,7 @@ static NTSTATUS nbench_exit(struct request_context *req)
 /*
   lock a byte range
 */
-static NTSTATUS nbench_lock(struct request_context *req, union smb_lock *lck)
+static NTSTATUS nbench_lock(struct smbsrv_request *req, union smb_lock *lck)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -522,7 +522,7 @@ static NTSTATUS nbench_lock(struct request_context *req, union smb_lock *lck)
 /*
   set info on a open file
 */
-static NTSTATUS nbench_setfileinfo(struct request_context *req, 
+static NTSTATUS nbench_setfileinfo(struct smbsrv_request *req, 
 				 union smb_setfileinfo *info)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
@@ -542,7 +542,7 @@ static NTSTATUS nbench_setfileinfo(struct request_context *req,
 /*
   return filesystem space info
 */
-static NTSTATUS nbench_fsinfo(struct request_context *req, union smb_fsinfo *fs)
+static NTSTATUS nbench_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -559,7 +559,7 @@ static NTSTATUS nbench_fsinfo(struct request_context *req, union smb_fsinfo *fs)
 /*
   return print queue info
 */
-static NTSTATUS nbench_lpq(struct request_context *req, union smb_lpq *lpq)
+static NTSTATUS nbench_lpq(struct smbsrv_request *req, union smb_lpq *lpq)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -574,7 +574,7 @@ static NTSTATUS nbench_lpq(struct request_context *req, union smb_lpq *lpq)
 /* 
    list files in a directory matching a wildcard pattern
 */
-static NTSTATUS nbench_search_first(struct request_context *req, union smb_search_first *io, 
+static NTSTATUS nbench_search_first(struct smbsrv_request *req, union smb_search_first *io, 
 				  void *search_private, 
 				  BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -602,7 +602,7 @@ static NTSTATUS nbench_search_first(struct request_context *req, union smb_searc
 }
 
 /* continue a search */
-static NTSTATUS nbench_search_next(struct request_context *req, union smb_search_next *io, 
+static NTSTATUS nbench_search_next(struct smbsrv_request *req, union smb_search_next *io, 
 				 void *search_private, 
 				 BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -617,7 +617,7 @@ static NTSTATUS nbench_search_next(struct request_context *req, union smb_search
 }
 
 /* close a search */
-static NTSTATUS nbench_search_close(struct request_context *req, union smb_search_close *io)
+static NTSTATUS nbench_search_close(struct smbsrv_request *req, union smb_search_close *io)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
@@ -630,7 +630,7 @@ static NTSTATUS nbench_search_close(struct request_context *req, union smb_searc
 }
 
 /* SMBtrans - not used on file shares */
-static NTSTATUS nbench_trans(struct request_context *req, struct smb_trans2 *trans2)
+static NTSTATUS nbench_trans(struct smbsrv_request *req, struct smb_trans2 *trans2)
 {
 	struct nbench_private *private = req->tcon->ntvfs_private;
 	NTSTATUS status;
diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index dd245b09ce..b7c110ebdb 100644
--- a/source4/ntvfs/ntvfs.h
+++ b/source4/ntvfs/ntvfs.h
@@ -30,50 +30,50 @@ struct ntvfs_ops {
 	enum ntvfs_type type;
 	
 	/* initial setup */
-	NTSTATUS (*connect)(struct request_context *req, const char *sharename);
+	NTSTATUS (*connect)(struct smbsrv_request *req, const char *sharename);
 	NTSTATUS (*disconnect)(struct smbsrv_tcon *tcon);
 
 	/* path operations */
-	NTSTATUS (*unlink)(struct request_context *req, struct smb_unlink *unl);
-	NTSTATUS (*chkpath)(struct request_context *req, struct smb_chkpath *cp);
-	NTSTATUS (*qpathinfo)(struct request_context *req, union smb_fileinfo *st);
-	NTSTATUS (*setpathinfo)(struct request_context *req, union smb_setfileinfo *st);
-	NTSTATUS (*open)(struct request_context *req, union smb_open *oi);
-	NTSTATUS (*mkdir)(struct request_context *req, union smb_mkdir *md);
-	NTSTATUS (*rmdir)(struct request_context *req, struct smb_rmdir *rd);
-	NTSTATUS (*rename)(struct request_context *req, union smb_rename *ren);
-	NTSTATUS (*copy)(struct request_context *req, struct smb_copy *cp);
+	NTSTATUS (*unlink)(struct smbsrv_request *req, struct smb_unlink *unl);
+	NTSTATUS (*chkpath)(struct smbsrv_request *req, struct smb_chkpath *cp);
+	NTSTATUS (*qpathinfo)(struct smbsrv_request *req, union smb_fileinfo *st);
+	NTSTATUS (*setpathinfo)(struct smbsrv_request *req, union smb_setfileinfo *st);
+	NTSTATUS (*open)(struct smbsrv_request *req, union smb_open *oi);
+	NTSTATUS (*mkdir)(struct smbsrv_request *req, union smb_mkdir *md);
+	NTSTATUS (*rmdir)(struct smbsrv_request *req, struct smb_rmdir *rd);
+	NTSTATUS (*rename)(struct smbsrv_request *req, union smb_rename *ren);
+	NTSTATUS (*copy)(struct smbsrv_request *req, struct smb_copy *cp);
 
 	/* directory search */
-	NTSTATUS (*search_first)(struct request_context *req, union smb_search_first *io, void *private,
+	NTSTATUS (*search_first)(struct smbsrv_request *req, union smb_search_first *io, void *private,
 				 BOOL (*callback)(void *private, union smb_search_data *file));
-	NTSTATUS (*search_next)(struct request_context *req, union smb_search_next *io, void *private,
+	NTSTATUS (*search_next)(struct smbsrv_request *req, union smb_search_next *io, void *private,
 				 BOOL (*callback)(void *private, union smb_search_data *file));
-	NTSTATUS (*search_close)(struct request_context *req, union smb_search_close *io);
+	NTSTATUS (*search_close)(struct smbsrv_request *req, union smb_search_close *io);
 
 	/* operations on open files */
-	NTSTATUS (*ioctl)(struct request_context *req, union smb_ioctl *io);
-	NTSTATUS (*read)(struct request_context *req, union smb_read *io);
-	NTSTATUS (*write)(struct request_context *req, union smb_write *io);
-	NTSTATUS (*seek)(struct request_context *req, struct smb_seek *io);
-	NTSTATUS (*flush)(struct request_context *req, struct smb_flush *flush);
-	NTSTATUS (*close)(struct request_context *req, union smb_close *io);
-	NTSTATUS (*exit)(struct request_context *req);
-	NTSTATUS (*lock)(struct request_context *req, union smb_lock *lck);
-	NTSTATUS (*setfileinfo)(struct request_context *req, union smb_setfileinfo *info);
-	NTSTATUS (*qfileinfo)(struct request_context *req, union smb_fileinfo *info);
+	NTSTATUS (*ioctl)(struct smbsrv_request *req, union smb_ioctl *io);
+	NTSTATUS (*read)(struct smbsrv_request *req, union smb_read *io);
+	NTSTATUS (*write)(struct smbsrv_request *req, union smb_write *io);
+	NTSTATUS (*seek)(struct smbsrv_request *req, struct smb_seek *io);
+	NTSTATUS (*flush)(struct smbsrv_request *req, struct smb_flush *flush);
+	NTSTATUS (*close)(struct smbsrv_request *req, union smb_close *io);
+	NTSTATUS (*exit)(struct smbsrv_request *req);
+	NTSTATUS (*lock)(struct smbsrv_request *req, union smb_lock *lck);
+	NTSTATUS (*setfileinfo)(struct smbsrv_request *req, union smb_setfileinfo *info);
+	NTSTATUS (*qfileinfo)(struct smbsrv_request *req, union smb_fileinfo *info);
 
 	/* filesystem operations */
-	NTSTATUS (*fsinfo)(struct request_context *req, union smb_fsinfo *fs);
+	NTSTATUS (*fsinfo)(struct smbsrv_request *req, union smb_fsinfo *fs);
 
 	/* printing specific operations */
-	NTSTATUS (*lpq)(struct request_context *req, union smb_lpq *lpq);
+	NTSTATUS (*lpq)(struct smbsrv_request *req, union smb_lpq *lpq);
 
 	/* trans2 interface - only used by CIFS backend to prover complete passthru for testing */
-	NTSTATUS (*trans2)(struct request_context *req, struct smb_trans2 *trans2);
+	NTSTATUS (*trans2)(struct smbsrv_request *req, struct smb_trans2 *trans2);
 
 	/* trans interface - used by IPC backend for pipes and RAP calls */
-	NTSTATUS (*trans)(struct request_context *req, struct smb_trans2 *trans);
+	NTSTATUS (*trans)(struct smbsrv_request *req, struct smb_trans2 *trans);
 };
 
 
@@ -83,5 +83,5 @@ struct ntvfs_critical_sizes {
 	int sizeof_ntvfs_ops;
 	int sizeof_SMB_OFF_T;
 	int sizeof_smbsrv_tcon;
-	int sizeof_request_context;
+	int sizeof_smbsrv_request;
 };
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index bb751bae01..f94dacb57f 100644
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -103,7 +103,7 @@ const struct ntvfs_critical_sizes *ntvfs_interface_version(void)
 		sizeof(struct ntvfs_ops),
 		sizeof(SMB_OFF_T),
 		sizeof(struct smbsrv_tcon),
-		sizeof(struct request_context),
+		sizeof(struct smbsrv_request),
 	};
 
 	return &critical_sizes;
@@ -133,7 +133,7 @@ BOOL ntvfs_init(void)
 /*
   initialise a connection structure to point at a NTVFS backend
 */
-NTSTATUS ntvfs_init_connection(struct request_context *req)
+NTSTATUS ntvfs_init_connection(struct smbsrv_request *req)
 {
 	const char *handler = lp_ntvfs_handler(req->tcon->service);
 
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index b2cf107b7d..ba2ec344f4 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -57,7 +57,7 @@ static BOOL is_exe_file(const char *fname)
 /* 
    NTVFS open generic to any mapper
 */
-NTSTATUS ntvfs_map_open(struct request_context *req, union smb_open *io)
+NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io)
 {
 	NTSTATUS status;
 	union smb_open io2;
@@ -249,7 +249,7 @@ NTSTATUS ntvfs_map_open(struct request_context *req, union smb_open *io)
 /* 
    NTVFS fsinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_fsinfo(struct request_context *req, union smb_fsinfo *fs)
+NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 {
 	NTSTATUS status;
 	union smb_fsinfo fs2;
@@ -368,7 +368,7 @@ NTSTATUS ntvfs_map_fsinfo(struct request_context *req, union smb_fsinfo *fs)
 /* 
    NTVFS fileinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_fileinfo(struct request_context *req, union smb_fileinfo *info, union smb_fileinfo *info2)
+NTSTATUS ntvfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info, union smb_fileinfo *info2)
 {
 	int i;
 	/* and convert it to the required level using results in info2 */
@@ -590,7 +590,7 @@ NTSTATUS ntvfs_map_fileinfo(struct request_context *req, union smb_fileinfo *inf
 /* 
    NTVFS fileinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_qfileinfo(struct request_context *req, union smb_fileinfo *info)
+NTSTATUS ntvfs_map_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	NTSTATUS status;
 	union smb_fileinfo info2;
@@ -613,7 +613,7 @@ NTSTATUS ntvfs_map_qfileinfo(struct request_context *req, union smb_fileinfo *in
 /* 
    NTVFS pathinfo generic to any mapper
 */
-NTSTATUS ntvfs_map_qpathinfo(struct request_context *req, union smb_fileinfo *info)
+NTSTATUS ntvfs_map_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	NTSTATUS status;
 	union smb_fileinfo info2;
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index e013e01979..90b6f9248d 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -31,7 +31,7 @@
   directory exists (tho it doesn't need to be accessible by the user,
   that comes later)
 */
-static NTSTATUS pvfs_connect(struct request_context *req, const char *sharename)
+static NTSTATUS pvfs_connect(struct smbsrv_request *req, const char *sharename)
 {
 	DEBUG(0,   ("Connection to share [%s] ACCESS DENIED!\n", sharename));
 	DEBUGADD(0,("This is because your using the 'ntvfs handler = default'.\n"));
diff --git a/source4/ntvfs/print/vfs_print.c b/source4/ntvfs/print/vfs_print.c
index a2ac429458..fa5835843a 100644
--- a/source4/ntvfs/print/vfs_print.c
+++ b/source4/ntvfs/print/vfs_print.c
@@ -29,7 +29,7 @@
   in. For printing shares this should check that the spool directory
   is available
 */
-static NTSTATUS print_connect(struct request_context *req, const char *sharename)
+static NTSTATUS print_connect(struct smbsrv_request *req, const char *sharename)
 {
 	return NT_STATUS_OK;
 }
@@ -45,7 +45,7 @@ static NTSTATUS print_disconnect(struct smbsrv_tcon *tcon)
 /*
   lots of operations are not allowed on printing shares - mostly return NT_STATUS_ACCESS_DENIED
 */
-static NTSTATUS print_unlink(struct request_context *req, struct smb_unlink *unl)
+static NTSTATUS print_unlink(struct smbsrv_request *req, struct smb_unlink *unl)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }
@@ -54,7 +54,7 @@ static NTSTATUS print_unlink(struct request_context *req, struct smb_unlink *unl
 /*
   ioctl - used for job query
 */
-static NTSTATUS print_ioctl(struct request_context *req, union smb_ioctl *io)
+static NTSTATUS print_ioctl(struct smbsrv_request *req, union smb_ioctl *io)
 {
 	char *p;
 
diff --git a/source4/ntvfs/reference/ref_util.c b/source4/ntvfs/reference/ref_util.c
index 75f3ac4948..e221086950 100644
--- a/source4/ntvfs/reference/ref_util.c
+++ b/source4/ntvfs/reference/ref_util.c
@@ -29,7 +29,7 @@
 /*
   convert a windows path to a unix path - don't do any manging or case sensitive handling
 */
-char *svfs_unix_path(struct request_context *req, const char *name)
+char *svfs_unix_path(struct smbsrv_request *req, const char *name)
 {
 	struct svfs_private *private = req->conn->ntvfs_private;
 	char *ret;
@@ -52,7 +52,7 @@ char *svfs_unix_path(struct request_context *req, const char *name)
   returned names are separate unix and DOS names. The returned names
   are relative to the directory
 */
-struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, const char *pattern)
+struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct smbsrv_request *req, const char *pattern)
 {
 	char *unix_path;
 	char *p, *mask;
diff --git a/source4/ntvfs/reference/vfs_ref.c b/source4/ntvfs/reference/vfs_ref.c
index 13b4eb5fbc..7a85afa4bb 100644
--- a/source4/ntvfs/reference/vfs_ref.c
+++ b/source4/ntvfs/reference/vfs_ref.c
@@ -35,7 +35,7 @@
   directory exists (tho it doesn't need to be accessible by the user,
   that comes later)
 */
-static NTSTATUS svfs_connect(struct request_context *req, const char *sharename)
+static NTSTATUS svfs_connect(struct smbsrv_request *req, const char *sharename)
 {
 	struct stat st;
 	struct tcon_context *conn = req->conn;
@@ -63,7 +63,7 @@ static NTSTATUS svfs_connect(struct request_context *req, const char *sharename)
 /*
   disconnect from a share
 */
-static NTSTATUS svfs_disconnect(struct request_context *req)
+static NTSTATUS svfs_disconnect(struct smbsrv_request *req)
 {
 	return NT_STATUS_OK;
 }
@@ -72,7 +72,7 @@ static NTSTATUS svfs_disconnect(struct request_context *req)
   delete a file - the dirtype specifies the file types to include in the search. 
   The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
 */
-static NTSTATUS svfs_unlink(struct request_context *req, struct smb_unlink *unl)
+static NTSTATUS svfs_unlink(struct smbsrv_request *req, struct smb_unlink *unl)
 {
 	char *unix_path;
 
@@ -90,7 +90,7 @@ static NTSTATUS svfs_unlink(struct request_context *req, struct smb_unlink *unl)
 /*
   ioctl interface - we don't do any
 */
-static NTSTATUS svfs_ioctl(struct request_context *req, struct smb_ioctl *io)
+static NTSTATUS svfs_ioctl(struct smbsrv_request *req, struct smb_ioctl *io)
 {
 	return NT_STATUS_INVALID_PARAMETER;
 }
@@ -98,7 +98,7 @@ static NTSTATUS svfs_ioctl(struct request_context *req, struct smb_ioctl *io)
 /*
   check if a directory exists
 */
-static NTSTATUS svfs_chkpath(struct request_context *req, struct smb_chkpath *cp)
+static NTSTATUS svfs_chkpath(struct smbsrv_request *req, struct smb_chkpath *cp)
 {
 	char *unix_path;
 	struct stat st;
@@ -119,7 +119,7 @@ static NTSTATUS svfs_chkpath(struct request_context *req, struct smb_chkpath *cp
 /*
   approximately map a struct stat to a fileinfo struct
 */
-static NTSTATUS map_fileinfo(struct request_context *req, union smb_fileinfo *info, struct stat *st)
+static NTSTATUS map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info, struct stat *st)
 {
 	switch (info->generic.level) {
 	case SMB_FILEINFO_NETWORK_OPEN_INFORMATION:
@@ -222,7 +222,7 @@ static NTSTATUS map_fileinfo(struct request_context *req, union smb_fileinfo *in
 /*
   return info on a pathname
 */
-static NTSTATUS svfs_qpathinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS svfs_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	char *unix_path;
 	struct stat st;
@@ -239,7 +239,7 @@ static NTSTATUS svfs_qpathinfo(struct request_context *req, union smb_fileinfo *
 /*
   query info on a open file
 */
-static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS svfs_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	struct stat st;
 
@@ -254,7 +254,7 @@ static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *
 /*
   set info on a pathname
 */
-static NTSTATUS svfs_setpathinfo(struct request_context *req, union smb_setfileinfo *st)
+static NTSTATUS svfs_setpathinfo(struct smbsrv_request *req, union smb_setfileinfo *st)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -262,7 +262,7 @@ static NTSTATUS svfs_setpathinfo(struct request_context *req, union smb_setfilei
 /*
   open a file
 */
-static NTSTATUS svfs_open(struct request_context *req, union smb_open *io)
+static NTSTATUS svfs_open(struct smbsrv_request *req, union smb_open *io)
 {
 	char *unix_path;
 	struct stat st;
@@ -342,7 +342,7 @@ static NTSTATUS svfs_open(struct request_context *req, union smb_open *io)
 /*
   create a directory
 */
-static NTSTATUS svfs_mkdir(struct request_context *req, union smb_mkdir *md)
+static NTSTATUS svfs_mkdir(struct smbsrv_request *req, union smb_mkdir *md)
 {
 	char *unix_path;
 
@@ -362,7 +362,7 @@ static NTSTATUS svfs_mkdir(struct request_context *req, union smb_mkdir *md)
 /*
   remove a directory
 */
-static NTSTATUS svfs_rmdir(struct request_context *req, struct smb_rmdir *rd)
+static NTSTATUS svfs_rmdir(struct smbsrv_request *req, struct smb_rmdir *rd)
 {
 	char *unix_path;
 
@@ -378,7 +378,7 @@ static NTSTATUS svfs_rmdir(struct request_context *req, struct smb_rmdir *rd)
 /*
   rename a set of files
 */
-static NTSTATUS svfs_rename(struct request_context *req, union smb_rename *ren)
+static NTSTATUS svfs_rename(struct smbsrv_request *req, union smb_rename *ren)
 {
 	char *unix_path1, *unix_path2;
 
@@ -395,7 +395,7 @@ static NTSTATUS svfs_rename(struct request_context *req, union smb_rename *ren)
 /*
   copy a set of files
 */
-static NTSTATUS svfs_copy(struct request_context *req, struct smb_copy *cp)
+static NTSTATUS svfs_copy(struct smbsrv_request *req, struct smb_copy *cp)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -403,7 +403,7 @@ static NTSTATUS svfs_copy(struct request_context *req, struct smb_copy *cp)
 /*
   read from a file
 */
-static NTSTATUS svfs_read(struct request_context *req, union smb_read *rd)
+static NTSTATUS svfs_read(struct smbsrv_request *req, union smb_read *rd)
 {
 	ssize_t ret;
 
@@ -428,7 +428,7 @@ static NTSTATUS svfs_read(struct request_context *req, union smb_read *rd)
 /*
   write to a file
 */
-static NTSTATUS svfs_write(struct request_context *req, union smb_write *wr)
+static NTSTATUS svfs_write(struct smbsrv_request *req, union smb_write *wr)
 {
 	ssize_t ret;
 
@@ -472,7 +472,7 @@ static NTSTATUS svfs_write(struct request_context *req, union smb_write *wr)
 /*
   seek in a file
 */
-static NTSTATUS svfs_seek(struct request_context *req, struct smb_seek *io)
+static NTSTATUS svfs_seek(struct smbsrv_request *req, struct smb_seek *io)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -480,7 +480,7 @@ static NTSTATUS svfs_seek(struct request_context *req, struct smb_seek *io)
 /*
   flush a file
 */
-static NTSTATUS svfs_flush(struct request_context *req, struct smb_flush *io)
+static NTSTATUS svfs_flush(struct smbsrv_request *req, struct smb_flush *io)
 {
 	fsync(io->in.fnum);
 	return NT_STATUS_OK;
@@ -489,7 +489,7 @@ static NTSTATUS svfs_flush(struct request_context *req, struct smb_flush *io)
 /*
   close a file
 */
-static NTSTATUS svfs_close(struct request_context *req, union smb_close *io)
+static NTSTATUS svfs_close(struct smbsrv_request *req, union smb_close *io)
 {
 	if (io->generic.level != SMB_CLOSE_CLOSE) {
 		/* we need a mapping function */
@@ -506,7 +506,7 @@ static NTSTATUS svfs_close(struct request_context *req, union smb_close *io)
 /*
   exit - closing files?
 */
-static NTSTATUS svfs_exit(struct request_context *req)
+static NTSTATUS svfs_exit(struct smbsrv_request *req)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -514,7 +514,7 @@ static NTSTATUS svfs_exit(struct request_context *req)
 /*
   lock a byte range
 */
-static NTSTATUS svfs_lock(struct request_context *req, union smb_lock *lck)
+static NTSTATUS svfs_lock(struct smbsrv_request *req, union smb_lock *lck)
 {
 	DEBUG(0,("REWRITE: not doing byte range locking!\n"));
 	return NT_STATUS_OK;
@@ -523,7 +523,7 @@ static NTSTATUS svfs_lock(struct request_context *req, union smb_lock *lck)
 /*
   set info on a open file
 */
-static NTSTATUS svfs_setfileinfo(struct request_context *req, 
+static NTSTATUS svfs_setfileinfo(struct smbsrv_request *req, 
 				 union smb_setfileinfo *info)
 {
 	DEBUG(0,("REWRITE: svfs_setfileinfo: not doing setfileinfo level %d\n", 
@@ -549,7 +549,7 @@ static NTSTATUS svfs_setfileinfo(struct request_context *req,
 /*
   return filesystem space info
 */
-static NTSTATUS svfs_fsinfo(struct request_context *req, union smb_fsinfo *fs)
+static NTSTATUS svfs_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 {
 	struct svfs_private *private = req->conn->ntvfs_private;
 
@@ -571,7 +571,7 @@ static NTSTATUS svfs_fsinfo(struct request_context *req, union smb_fsinfo *fs)
 /*
   return filesystem attribute info
 */
-static NTSTATUS svfs_fsattr(struct request_context *req, union smb_fsattr *fs)
+static NTSTATUS svfs_fsattr(struct smbsrv_request *req, union smb_fsattr *fs)
 {
 	struct stat st;
 	struct svfs_private *private = req->conn->ntvfs_private;
@@ -601,7 +601,7 @@ static NTSTATUS svfs_fsattr(struct request_context *req, union smb_fsattr *fs)
 /*
   return print queue info
 */
-static NTSTATUS svfs_lpq(struct request_context *req, union smb_lpq *lpq)
+static NTSTATUS svfs_lpq(struct smbsrv_request *req, union smb_lpq *lpq)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -609,7 +609,7 @@ static NTSTATUS svfs_lpq(struct request_context *req, union smb_lpq *lpq)
 /* 
    list files in a directory matching a wildcard pattern
 */
-NTSTATUS svfs_search_first(struct request_context *req, union smb_search_first *io, 
+NTSTATUS svfs_search_first(struct smbsrv_request *req, union smb_search_first *io, 
 			   void *search_private, 
 			   BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -683,7 +683,7 @@ NTSTATUS svfs_search_first(struct request_context *req, union smb_search_first *
 }
 
 /* continue a search */
-NTSTATUS svfs_search_next(struct request_context *req, union smb_search_next *io, 
+NTSTATUS svfs_search_next(struct smbsrv_request *req, union smb_search_next *io, 
 			   void *search_private, 
 			   BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -770,7 +770,7 @@ found:
 }
 
 /* close a search */
-NTSTATUS svfs_search_close(struct request_context *req, union smb_search_close *io)
+NTSTATUS svfs_search_close(struct smbsrv_request *req, union smb_search_close *io)
 {
 	struct svfs_private *private = req->conn->ntvfs_private;
 	struct search_state *search;
diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index 0f0555ac18..7da9667e3c 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -29,7 +29,7 @@
 /*
   convert a windows path to a unix path - don't do any manging or case sensitive handling
 */
-char *svfs_unix_path(struct request_context *req, const char *name)
+char *svfs_unix_path(struct smbsrv_request *req, const char *name)
 {
 	struct svfs_private *private = req->tcon->ntvfs_private;
 	char *ret;
@@ -52,7 +52,7 @@ char *svfs_unix_path(struct request_context *req, const char *name)
   returned names are separate unix and DOS names. The returned names
   are relative to the directory
 */
-struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct request_context *req, const char *unix_path)
+struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct smbsrv_request *req, const char *unix_path)
 {
 	char *p, *mask;
 	struct svfs_dir *dir;
@@ -135,7 +135,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct request_context *req
   returned names are separate unix and DOS names. The returned names
   are relative to the directory
 */
-struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct request_context *req, const char *pattern)
+struct svfs_dir *svfs_list(TALLOC_CTX *mem_ctx, struct smbsrv_request *req, const char *pattern)
 {
 	char *unix_path;
 
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 013419e4ee..ad889daf36 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -61,7 +61,7 @@ static ssize_t pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offs
   directory exists (tho it doesn't need to be accessible by the user,
   that comes later)
 */
-static NTSTATUS svfs_connect(struct request_context *req, const char *sharename)
+static NTSTATUS svfs_connect(struct smbsrv_request *req, const char *sharename)
 {
 	struct stat st;
 	struct smbsrv_tcon *tcon = req->tcon;
@@ -116,7 +116,7 @@ static struct svfs_file *find_fd(struct svfs_private *private, int fd)
   delete a file - the dirtype specifies the file types to include in the search. 
   The name can contain CIFS wildcards, but rarely does (except with OS/2 clients)
 */
-static NTSTATUS svfs_unlink(struct request_context *req, struct smb_unlink *unl)
+static NTSTATUS svfs_unlink(struct smbsrv_request *req, struct smb_unlink *unl)
 {
 	char *unix_path;
 
@@ -136,7 +136,7 @@ static NTSTATUS svfs_unlink(struct request_context *req, struct smb_unlink *unl)
 /*
   ioctl interface - we don't do any
 */
-static NTSTATUS svfs_ioctl(struct request_context *req, union smb_ioctl *io)
+static NTSTATUS svfs_ioctl(struct smbsrv_request *req, union smb_ioctl *io)
 {
 	return NT_STATUS_INVALID_PARAMETER;
 }
@@ -144,7 +144,7 @@ static NTSTATUS svfs_ioctl(struct request_context *req, union smb_ioctl *io)
 /*
   check if a directory exists
 */
-static NTSTATUS svfs_chkpath(struct request_context *req, struct smb_chkpath *cp)
+static NTSTATUS svfs_chkpath(struct smbsrv_request *req, struct smb_chkpath *cp)
 {
 	char *unix_path;
 	struct stat st;
@@ -165,7 +165,7 @@ static NTSTATUS svfs_chkpath(struct request_context *req, struct smb_chkpath *cp
 /*
   approximately map a struct stat to a generic fileinfo struct
 */
-static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinfo *info, 
+static NTSTATUS svfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo *info, 
 				  struct stat *st, const char *unix_path)
 {
 	struct svfs_dir *dir = NULL;
@@ -241,7 +241,7 @@ static NTSTATUS svfs_map_fileinfo(struct request_context *req, union smb_fileinf
 /*
   return info on a pathname
 */
-static NTSTATUS svfs_qpathinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS svfs_qpathinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	char *unix_path;
 	struct stat st;
@@ -266,7 +266,7 @@ static NTSTATUS svfs_qpathinfo(struct request_context *req, union smb_fileinfo *
 /*
   query info on a open file
 */
-static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *info)
+static NTSTATUS svfs_qfileinfo(struct smbsrv_request *req, union smb_fileinfo *info)
 {
 	struct svfs_private *private = req->tcon->ntvfs_private;
 	struct svfs_file *f;
@@ -294,7 +294,7 @@ static NTSTATUS svfs_qfileinfo(struct request_context *req, union smb_fileinfo *
 /*
   open a file
 */
-static NTSTATUS svfs_open(struct request_context *req, union smb_open *io)
+static NTSTATUS svfs_open(struct smbsrv_request *req, union smb_open *io)
 {
 	struct svfs_private *private = req->tcon->ntvfs_private;
 	char *unix_path;
@@ -400,7 +400,7 @@ do_open:
 /*
   create a directory
 */
-static NTSTATUS svfs_mkdir(struct request_context *req, union smb_mkdir *md)
+static NTSTATUS svfs_mkdir(struct smbsrv_request *req, union smb_mkdir *md)
 {
 	char *unix_path;
 
@@ -422,7 +422,7 @@ static NTSTATUS svfs_mkdir(struct request_context *req, union smb_mkdir *md)
 /*
   remove a directory
 */
-static NTSTATUS svfs_rmdir(struct request_context *req, struct smb_rmdir *rd)
+static NTSTATUS svfs_rmdir(struct smbsrv_request *req, struct smb_rmdir *rd)
 {
 	char *unix_path;
 
@@ -440,7 +440,7 @@ static NTSTATUS svfs_rmdir(struct request_context *req, struct smb_rmdir *rd)
 /*
   rename a set of files
 */
-static NTSTATUS svfs_rename(struct request_context *req, union smb_rename *ren)
+static NTSTATUS svfs_rename(struct smbsrv_request *req, union smb_rename *ren)
 {
 	char *unix_path1, *unix_path2;
 
@@ -463,7 +463,7 @@ static NTSTATUS svfs_rename(struct request_context *req, union smb_rename *ren)
 /*
   copy a set of files
 */
-static NTSTATUS svfs_copy(struct request_context *req, struct smb_copy *cp)
+static NTSTATUS svfs_copy(struct smbsrv_request *req, struct smb_copy *cp)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -471,7 +471,7 @@ static NTSTATUS svfs_copy(struct request_context *req, struct smb_copy *cp)
 /*
   read from a file
 */
-static NTSTATUS svfs_read(struct request_context *req, union smb_read *rd)
+static NTSTATUS svfs_read(struct smbsrv_request *req, union smb_read *rd)
 {
 	ssize_t ret;
 
@@ -497,7 +497,7 @@ static NTSTATUS svfs_read(struct request_context *req, union smb_read *rd)
 /*
   write to a file
 */
-static NTSTATUS svfs_write(struct request_context *req, union smb_write *wr)
+static NTSTATUS svfs_write(struct smbsrv_request *req, union smb_write *wr)
 {
 	ssize_t ret;
 
@@ -543,7 +543,7 @@ static NTSTATUS svfs_write(struct request_context *req, union smb_write *wr)
 /*
   seek in a file
 */
-static NTSTATUS svfs_seek(struct request_context *req, struct smb_seek *io)
+static NTSTATUS svfs_seek(struct smbsrv_request *req, struct smb_seek *io)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -551,7 +551,7 @@ static NTSTATUS svfs_seek(struct request_context *req, struct smb_seek *io)
 /*
   flush a file
 */
-static NTSTATUS svfs_flush(struct request_context *req, struct smb_flush *io)
+static NTSTATUS svfs_flush(struct smbsrv_request *req, struct smb_flush *io)
 {
 	fsync(io->in.fnum);
 	return NT_STATUS_OK;
@@ -560,7 +560,7 @@ static NTSTATUS svfs_flush(struct request_context *req, struct smb_flush *io)
 /*
   close a file
 */
-static NTSTATUS svfs_close(struct request_context *req, union smb_close *io)
+static NTSTATUS svfs_close(struct smbsrv_request *req, union smb_close *io)
 {
 	struct svfs_private *private = req->tcon->ntvfs_private;
 	struct svfs_file *f;
@@ -589,7 +589,7 @@ static NTSTATUS svfs_close(struct request_context *req, union smb_close *io)
 /*
   exit - closing files?
 */
-static NTSTATUS svfs_exit(struct request_context *req)
+static NTSTATUS svfs_exit(struct smbsrv_request *req)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -597,7 +597,7 @@ static NTSTATUS svfs_exit(struct request_context *req)
 /*
   lock a byte range
 */
-static NTSTATUS svfs_lock(struct request_context *req, union smb_lock *lck)
+static NTSTATUS svfs_lock(struct smbsrv_request *req, union smb_lock *lck)
 {
 	DEBUG(0,("REWRITE: not doing byte range locking!\n"));
 	return NT_STATUS_OK;
@@ -606,7 +606,7 @@ static NTSTATUS svfs_lock(struct request_context *req, union smb_lock *lck)
 /*
   set info on a pathname
 */
-static NTSTATUS svfs_setpathinfo(struct request_context *req, union smb_setfileinfo *st)
+static NTSTATUS svfs_setpathinfo(struct smbsrv_request *req, union smb_setfileinfo *st)
 {
 	CHECK_READ_ONLY(req);
 
@@ -616,7 +616,7 @@ static NTSTATUS svfs_setpathinfo(struct request_context *req, union smb_setfilei
 /*
   set info on a open file
 */
-static NTSTATUS svfs_setfileinfo(struct request_context *req, 
+static NTSTATUS svfs_setfileinfo(struct smbsrv_request *req, 
 				 union smb_setfileinfo *info)
 {
 	struct utimbuf unix_times;
@@ -659,7 +659,7 @@ static NTSTATUS svfs_setfileinfo(struct request_context *req,
 /*
   return filesystem space info
 */
-static NTSTATUS svfs_fsinfo(struct request_context *req, union smb_fsinfo *fs)
+static NTSTATUS svfs_fsinfo(struct smbsrv_request *req, union smb_fsinfo *fs)
 {
 	struct svfs_private *private = req->tcon->ntvfs_private;
 	struct stat st;
@@ -700,7 +700,7 @@ static NTSTATUS svfs_fsinfo(struct request_context *req, union smb_fsinfo *fs)
 /*
   return filesystem attribute info
 */
-static NTSTATUS svfs_fsattr(struct request_context *req, union smb_fsattr *fs)
+static NTSTATUS svfs_fsattr(struct smbsrv_request *req, union smb_fsattr *fs)
 {
 	struct stat st;
 	struct svfs_private *private = req->tcon->ntvfs_private;
@@ -731,7 +731,7 @@ static NTSTATUS svfs_fsattr(struct request_context *req, union smb_fsattr *fs)
 /*
   return print queue info
 */
-static NTSTATUS svfs_lpq(struct request_context *req, union smb_lpq *lpq)
+static NTSTATUS svfs_lpq(struct smbsrv_request *req, union smb_lpq *lpq)
 {
 	return NT_STATUS_NOT_SUPPORTED;
 }
@@ -739,7 +739,7 @@ static NTSTATUS svfs_lpq(struct request_context *req, union smb_lpq *lpq)
 /* 
    list files in a directory matching a wildcard pattern
 */
-static NTSTATUS svfs_search_first(struct request_context *req, union smb_search_first *io, 
+static NTSTATUS svfs_search_first(struct smbsrv_request *req, union smb_search_first *io, 
 				  void *search_private, 
 				  BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -813,7 +813,7 @@ static NTSTATUS svfs_search_first(struct request_context *req, union smb_search_
 }
 
 /* continue a search */
-static NTSTATUS svfs_search_next(struct request_context *req, union smb_search_next *io, 
+static NTSTATUS svfs_search_next(struct smbsrv_request *req, union smb_search_next *io, 
 				 void *search_private, 
 				 BOOL (*callback)(void *, union smb_search_data *))
 {
@@ -900,7 +900,7 @@ found:
 }
 
 /* close a search */
-static NTSTATUS svfs_search_close(struct request_context *req, union smb_search_close *io)
+static NTSTATUS svfs_search_close(struct smbsrv_request *req, union smb_search_close *io)
 {
 	struct svfs_private *private = req->tcon->ntvfs_private;
 	struct search_state *search;
@@ -921,7 +921,7 @@ static NTSTATUS svfs_search_close(struct request_context *req, union smb_search_
 }
 
 /* SMBtrans - not used on file shares */
-static NTSTATUS svfs_trans(struct request_context *req, struct smb_trans2 *trans2)
+static NTSTATUS svfs_trans(struct smbsrv_request *req, struct smb_trans2 *trans2)
 {
 	return NT_STATUS_ACCESS_DENIED;
 }