diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:19:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:19:50 -0800 |
| commit | 5d637c4a5146f803a872275c139fc11914056d74 (patch) | |
| tree | 160f073d8ebf51f499150325dc1b6d1985dd1380 | |
| parent | 06165752c8dfd7c6a3f3186bd6dec86a70895c72 (diff) | |
| parent | d7c2feaf88df39124e278b9e775b245b057ac99e (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | fs/dlm/rcom.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 082d1ee154a..fd81e0672c0 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 035e6f9990b..67522c268c1 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); |