diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-25 03:01:51 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-02-04 01:24:07 -0600 |
| commit | 4007685c6e6b5c92a07f27cd754bcca394168af2 (patch) | |
| tree | 74b9f2966603d2a9fc795e9d58a84c721befd7ab /fs/dlm/rcom.c | |
| parent | 93ff2971e99c90d1c4d39d242ef6050d2dc853d3 (diff) | |
| download | linux-4007685c6e6b5c92a07f27cd754bcca394168af2.tar.gz linux-4007685c6e6b5c92a07f27cd754bcca394168af2.tar.bz2 linux-4007685c6e6b5c92a07f27cd754bcca394168af2.zip | |
dlm: use proper type for ->ls_recover_buf
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/rcom.c')
| -rw-r--r-- | fs/dlm/rcom.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c index fb0776201d73..3f9b96fd26e8 100644 --- a/fs/dlm/rcom.c +++ b/fs/dlm/rcom.c @@ -129,7 +129,7 @@ int dlm_rcom_status(struct dlm_ls *ls, int nodeid) ls->ls_recover_nodeid = nodeid; if (nodeid == dlm_our_nodeid()) { - rc = (struct dlm_rcom *) ls->ls_recover_buf; + rc = ls->ls_recover_buf; rc->rc_result = dlm_recover_status(ls); goto out; } @@ -148,7 +148,7 @@ int dlm_rcom_status(struct dlm_ls *ls, int nodeid) if (error) goto out; - rc = (struct dlm_rcom *) ls->ls_recover_buf; + rc = ls->ls_recover_buf; if (rc->rc_result == -ESRCH) { /* we pretend the remote lockspace exists with 0 status */ @@ -202,14 +202,15 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len) { struct dlm_rcom *rc; struct dlm_mhandle *mh; - int error = 0, len = sizeof(struct dlm_rcom); + int error = 0; + int max_size = dlm_config.ci_buffer_size - sizeof(struct dlm_rcom); ls->ls_recover_nodeid = nodeid; if (nodeid == dlm_our_nodeid()) { dlm_copy_master_names(ls, last_name, last_len, - ls->ls_recover_buf + len, - dlm_config.ci_buffer_size - len, nodeid); + ls->ls_recover_buf->rc_buf, + max_size, nodeid); goto out; } |