Commit 5d637c4a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 06165752 d7c2feaf
...@@ -1324,8 +1324,7 @@ P: David Teigland ...@@ -1324,8 +1324,7 @@ P: David Teigland
M: teigland@redhat.com M: teigland@redhat.com
L: cluster-devel@redhat.com L: cluster-devel@redhat.com
W: http://sources.redhat.com/cluster/ 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/teigland/dlm.git
T: git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
S: Supported S: Supported
DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
......
...@@ -215,6 +215,8 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len) ...@@ -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; ls->ls_recover_nodeid = nodeid;
if (nodeid == dlm_our_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, dlm_copy_master_names(ls, last_name, last_len,
ls->ls_recover_buf->rc_buf, ls->ls_recover_buf->rc_buf,
max_size, nodeid); max_size, nodeid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment