diff options
| author | Mark Fasheh <mark.fasheh@oracle.com> | 2006-09-08 11:38:29 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-09-24 13:50:42 -0700 |
| commit | 3384f3df5ed939a25135e1b2734fb7cdee1720a8 (patch) | |
| tree | 7a68180b6adeb74b5a0a96e6c2d4ad529b34096d /fs/ocfs2/dlm/dlmrecovery.c | |
| parent | e2c73698af3dac89328eef2b55f6746e0507d2bc (diff) | |
| download | kernel_samsung_smdk4412-3384f3df5ed939a25135e1b2734fb7cdee1720a8.zip kernel_samsung_smdk4412-3384f3df5ed939a25135e1b2734fb7cdee1720a8.tar.gz kernel_samsung_smdk4412-3384f3df5ed939a25135e1b2734fb7cdee1720a8.tar.bz2 | |
ocfs2: Allow binary names in the DLM
The OCFS2 DLM uses strlen() to determine lock name length, which excludes
the possibility of putting binary values in the name string. Fix this by
requiring that string length be passed in as a parameter.
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmrecovery.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index 594745f..9d950d7 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c @@ -2285,7 +2285,8 @@ again: memset(&lksb, 0, sizeof(lksb)); ret = dlmlock(dlm, LKM_EXMODE, &lksb, LKM_NOQUEUE|LKM_RECOVERY, - DLM_RECOVERY_LOCK_NAME, dlm_reco_ast, dlm, dlm_reco_bast); + DLM_RECOVERY_LOCK_NAME, DLM_RECOVERY_LOCK_NAME_LEN, + dlm_reco_ast, dlm, dlm_reco_bast); mlog(0, "%s: dlmlock($RECOVERY) returned %d, lksb=%d\n", dlm->name, ret, lksb.status); |