CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: [EMAIL PROTECTED] 2007-10-05 10:06:24
Modified files:
dlm-kernel/src : device.c
Log message:
Don't overwrite castparam if /it/ is NULL.
Checking castaddr is wrong because it's not possible to affect that
from the userland API.
This is also consistent with the fix for bz#318061 in RHEL5.
This check-in fixes bz#318851 but TPTB will decide whether it gets
included
in RHEL4.6
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/device.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.24.2.11&r2=1.24.2.12
--- cluster/dlm-kernel/src/Attic/device.c 2007/09/26 13:53:20
1.24.2.11
+++ cluster/dlm-kernel/src/Attic/device.c 2007/10/05 10:06:24
1.24.2.12
@@ -1075,10 +1075,10 @@
the existing li_castaddr as that's the completion routine for
unlocks. dlm_unlock_wait() specifies a new AST routine to be
executed when the unlock completes. */
- if (kparams->castaddr) {
+ if (kparams->castaddr)
li->li_castaddr = kparams->castaddr;
+ if (kparams->castparam)
li->li_castparam = kparams->castparam;
- }
/* Have to do it here cos the lkb may not exist after
* dlm_unlock() */
