CVSROOT:        /cvs/cluster
Module name:    cluster
Branch:         RHEL46
Changes by:     [EMAIL PROTECTED]       2007-10-09 07:24:12

Modified files:
        dlm-kernel/src : device.c 

Log message:
        Only update castparam if it's non-NULL.
        bz#318851

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/device.c.diff?cvsroot=cluster&only_with_tag=RHEL46&r1=1.24.2.11&r2=1.24.2.11.2.1

--- 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/09 07:24:12     
1.24.2.11.2.1
@@ -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() */

Reply via email to