diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:55:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:55:11 -0400 |
| commit | 99f4065bac7b8c3f829334b4218a5c2e68cbe440 (patch) | |
| tree | a7a675dc9cdc386abad4c7ce27ef5a8b59e18507 /fs/dlm/config.c | |
| parent | f539abece1b7e36fae6add4f9ea29203d40badcb (diff) | |
| parent | e43f055a953721ed1787a039ab5e720755596ea2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: use alloc_workqueue function
dlm: increase default hash table sizes
dlm: record full callback state
Diffstat (limited to 'fs/dlm/config.c')
| -rw-r--r-- | fs/dlm/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index b54bca03d92f..0d329ff8ed4c 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c | |||
| @@ -977,9 +977,9 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) | |||
| 977 | /* Config file defaults */ | 977 | /* Config file defaults */ |
| 978 | #define DEFAULT_TCP_PORT 21064 | 978 | #define DEFAULT_TCP_PORT 21064 |
| 979 | #define DEFAULT_BUFFER_SIZE 4096 | 979 | #define DEFAULT_BUFFER_SIZE 4096 |
| 980 | #define DEFAULT_RSBTBL_SIZE 256 | 980 | #define DEFAULT_RSBTBL_SIZE 1024 |
| 981 | #define DEFAULT_LKBTBL_SIZE 1024 | 981 | #define DEFAULT_LKBTBL_SIZE 1024 |
| 982 | #define DEFAULT_DIRTBL_SIZE 512 | 982 | #define DEFAULT_DIRTBL_SIZE 1024 |
| 983 | #define DEFAULT_RECOVER_TIMER 5 | 983 | #define DEFAULT_RECOVER_TIMER 5 |
| 984 | #define DEFAULT_TOSS_SECS 10 | 984 | #define DEFAULT_TOSS_SECS 10 |
| 985 | #define DEFAULT_SCAN_SECS 5 | 985 | #define DEFAULT_SCAN_SECS 5 |