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: update git tree in MAINTAINERS
  dlm: fix rcom_names message to self

2 files changed, 3 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 082d1ee154a9..fd81e0672c0d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1324,8 +1324,7 @@ P:	David Teigland
 M:      teigland@redhat.com
 L:      cluster-devel@redhat.com
 W:      http://sources.redhat.com/cluster/
-T:      git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
-T:      git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/teigland/dlm.git
 S:      Supported
 
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
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);