[SCM] Samba Shared Repository - branch master updated - ff211be69681c8dbbd7b6364fafb7aa6e8b5a1f5

Volker Lendecke vlendec at samba.org
Sat Oct 25 10:07:41 GMT 2008


The branch, master has been updated
       via  ff211be69681c8dbbd7b6364fafb7aa6e8b5a1f5 (commit)
      from  d6afe7c61a7ba36253321bbdac7b65fc925cacde (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ff211be69681c8dbbd7b6364fafb7aa6e8b5a1f5
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 25 12:09:58 2008 +0200

    Remove "pipe_handle_offset" -- pipes now use "struct files_struct"

-----------------------------------------------------------------------

Summary of changes:
 source3/include/proto.h           |    1 -
 source3/rpc_server/srv_pipe_hnd.c |   16 ----------------
 source3/smbd/files.c              |    5 -----
 3 files changed, 0 insertions(+), 22 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 83cd740..d04968e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7110,7 +7110,6 @@ bool api_pipe_request(pipes_struct *p);
 
 pipes_struct *get_first_internal_pipe(void);
 pipes_struct *get_next_internal_pipe(pipes_struct *p);
-void set_pipe_handle_offset(int max_open_files);
 void init_rpc_pipe_hnd(void);
 
 bool fsp_is_np(struct files_struct *fsp);
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index c8037e6..aaa3557 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -55,22 +55,6 @@ pipes_struct *get_next_internal_pipe(pipes_struct *p)
 	return p->next;
 }
 
-/* this must be larger than the sum of the open files and directories */
-static int pipe_handle_offset;
-
-/****************************************************************************
- Set the pipe_handle_offset. Called from smbd/files.c
-****************************************************************************/
-
-void set_pipe_handle_offset(int max_open_files)
-{
-	if(max_open_files < 0x7000) {
-		pipe_handle_offset = 0x7000;
-	} else {
-		pipe_handle_offset = max_open_files + 10; /* For safety. :-) */
-	}
-}
-
 /****************************************************************************
  Initialise pipe handle states.
 ****************************************************************************/
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 4a27d02..d3bfce7 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -200,11 +200,6 @@ open files, %d are available.\n", request_max_open_files, real_max_open_files));
 	if (!file_bmap) {
 		exit_server("out of memory in file_init");
 	}
-	
-	/*
-	 * Ensure that pipe_handle_oppset is set correctly.
-	 */
-	set_pipe_handle_offset(real_max_open_files);
 }
 
 /****************************************************************************


-- 
Samba Shared Repository


More information about the samba-cvs mailing list