summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-12-16 10:19:19 -0800
committerJeremy Allison <jra@samba.org>2009-12-16 10:19:19 -0800
commit8f4d4a67587655dffe669cdda4ceed108bcfc4e7 (patch)
treef785bdbd7c20bb64274a7041f5e76da2fddc8125 /source3
parentb8c87c43dd9309b3d2fed5d5db5b38057a8e4e90 (diff)
downloadsamba-8f4d4a67587655dffe669cdda4ceed108bcfc4e7.tar.gz
samba-8f4d4a67587655dffe669cdda4ceed108bcfc4e7.tar.bz2
samba-8f4d4a67587655dffe669cdda4ceed108bcfc4e7.zip
Final part of the fix for 6837 - "Too many open files" when trying to access large number of files
Win7 needs a min of 16k file handles to work against a server. Jeremy.
Diffstat (limited to 'source3')
-rw-r--r--source3/include/local.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/source3/include/local.h b/source3/include/local.h
index de54ea5886..a88b17be13 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -56,17 +56,6 @@
#define SYSLOG_FACILITY LOG_DAEMON
#endif
-/*
- * Default number of maximum open files per smbd. This is
- * also limited by the maximum available file descriptors
- * per process and can also be set in smb.conf as "max open files"
- * in the [global] section.
- */
-
-#ifndef MAX_OPEN_FILES
-#define MAX_OPEN_FILES 10000
-#endif
-
/*
* Fudgefactor required for open tdb's, etc.
*/
@@ -82,7 +71,18 @@
*/
#ifndef MIN_OPEN_FILES_WINDOWS
-#define MIN_OPEN_FILES_WINDOWS 1050
+#define MIN_OPEN_FILES_WINDOWS 16384
+#endif
+
+/*
+ * Default number of maximum open files per smbd. This is
+ * also limited by the maximum available file descriptors
+ * per process and can also be set in smb.conf as "max open files"
+ * in the [global] section.
+ */
+
+#ifndef MAX_OPEN_FILES
+#define MAX_OPEN_FILES (MIN_OPEN_FILES_WINDOWS + MAX_OPEN_FUDGEFACTOR)
#endif
#define WORDMAX 0xFFFF