CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: [EMAIL PROTECTED] 2007-09-26 13:53:20
Modified files:
dlm-kernel/src : device.c
Log message:
Don't overwrite castparam if there is no new ast routine to go with it.
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.10&r2=1.24.2.11
--- cluster/dlm-kernel/src/Attic/device.c 2007/09/12 08:40:09
1.24.2.10
+++ cluster/dlm-kernel/src/Attic/device.c 2007/09/26 13:53:20
1.24.2.11
@@ -1069,15 +1069,16 @@
}
li->li_user_lksb = kparams->lksb;
- li->li_castparam = kparams->castparam;
li->li_cmd = cmd;
/* dlm_unlock() passes a 0 for castaddr which means don't overwrite
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;
+ li->li_castparam = kparams->castparam;
+ }
/* Have to do it here cos the lkb may not exist after
* dlm_unlock() */
