Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index 035e6f9990b0..67522c268c14 100644
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -215,6 +215,8 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
         ls->ls_recover_nodeid = nodeid;
 
         if (nodeid == dlm_our_nodeid()) {
+                ls->ls_recover_buf->rc_header.h_length =
+                        dlm_config.ci_buffer_size;
                 dlm_copy_master_names(ls, last_name, last_len,
                                       ls->ls_recover_buf->rc_buf,
                                       max_size, nodeid);