git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
dlm
/
config.h
diff --git
a/fs/dlm/config.h
b/fs/dlm/config.h
index
dd0ce24
..
3099d0d
100644
(file)
--- a/
fs/dlm/config.h
+++ b/
fs/dlm/config.h
@@
-20,7
+20,6
@@
struct dlm_config_info {
int ci_tcp_port;
int ci_buffer_size;
int ci_rsbtbl_size;
int ci_tcp_port;
int ci_buffer_size;
int ci_rsbtbl_size;
- int ci_lkbtbl_size;
int ci_dirtbl_size;
int ci_recover_timer;
int ci_toss_secs;
int ci_dirtbl_size;
int ci_recover_timer;
int ci_toss_secs;
@@
-29,6
+28,7
@@
struct dlm_config_info {
int ci_protocol;
int ci_timewarn_cs;
int ci_waitwarn_us;
int ci_protocol;
int ci_timewarn_cs;
int ci_waitwarn_us;
+ int ci_new_rsb_count;
};
extern struct dlm_config_info dlm_config;
};
extern struct dlm_config_info dlm_config;