r1280: rename struct request_context to smbsrv_request

metze
(This used to be commit a85d2db5826a84b812ea5162a11f54edd25f74e3)

2 files changed, 31 insertions, 31 deletions

diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index 0f0555ac18b..7da9667e3c8 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 013419e4eea..ad889daf36d 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;
 }