Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[linux-2.6] / fs / dlm / config.h

diff --git a/fs/dlm/config.h b/fs/dlm/config.h
index 9da7839958a99c87a033efc9c6069041d6aa525b..1e978611a96e7165b480d09ac3a129f1839b0950 100644 (file)
--- a/fs/dlm/config.h
+++ b/fs/dlm/config.h
@@ -17,14 +17,15 @@
 #define DLM_MAX_ADDR_COUNT 3
 
 struct dlm_config_info {
-       int tcp_port;
-       int buffer_size;
-       int rsbtbl_size;
-       int lkbtbl_size;
-       int dirtbl_size;
-       int recover_timer;
-       int toss_secs;
-       int scan_secs;
+       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_scan_secs;
+       int ci_log_debug;
 };
 
 extern struct dlm_config_info dlm_config;