Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / fs / dlm / midcomms.c

diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c
index d96f9bbb407c4f8a339f7625b99ea1ffeea4d609..a5126e0c68a69e6983e7d77833586bd928e7a3a7 100644 (file)
--- a/fs/dlm/midcomms.c
+++ b/fs/dlm/midcomms.c
@@ -82,7 +82,7 @@ int dlm_process_incoming_buffer(int nodeid, const void *base,
                if (msglen < sizeof(struct dlm_header))
                        break;
                err = -E2BIG;
-               if (msglen > dlm_config.buffer_size) {
+               if (msglen > dlm_config.ci_buffer_size) {
                        log_print("message size %d from %d too big, buf len %d",
                                  msglen, nodeid, len);
                        break;
@@ -103,7 +103,7 @@ int dlm_process_incoming_buffer(int nodeid, const void *base,
 
                if (msglen > sizeof(__tmp) &&
                    msg == (struct dlm_header *) __tmp) {
-                       msg = kmalloc(dlm_config.buffer_size, GFP_KERNEL);
+                       msg = kmalloc(dlm_config.ci_buffer_size, GFP_KERNEL);
                        if (msg == NULL)
                                return ret;
                }
@@ -119,7 +119,7 @@ int dlm_process_incoming_buffer(int nodeid, const void *base,
 
                switch (msg->h_cmd) {
                case DLM_MSG:
-                       dlm_receive_message(msg, nodeid, FALSE);
+                       dlm_receive_message(msg, nodeid, 0);
                        break;
 
                case DLM_RCOM: