From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 3 Dec 2011 21:10:43 +0000 (+0000)
Subject: rx: Some kernels have no reschedule function
X-Git-Tag: upstream/1.8.0_pre1^2~2972
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5c6640bf0b2b365d4871051db7a1be6075d44666;p=packages%2Fo%2Fopenafs.git

rx: Some kernels have no reschedule function

If RXK_TIMEDSLEEP_ENV isn't set, then Unix kernel cache managers
call rxevent_Init without a reschedule function. Check for this so
we don't end up calling a NULL function in these situations.

Change-Id: I5e89f5247aeffc4c27d3f81c0ccabe4979232846
Reviewed-on: http://gerrit.openafs.org/6206
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/rx/rx_event.c b/src/rx/rx_event.c
index 6baf8a8e6..7f9c3c75c 100644
--- a/src/rx/rx_event.c
+++ b/src/rx/rx_event.c
@@ -285,7 +285,8 @@ rxevent_Post(struct clock *when, struct clock *now,
 	eventSchedule.raised = 1;
 	clock_Zero(&eventSchedule.next);
 	MUTEX_EXIT(&eventTree.lock);
-	(*eventSchedule.func)();
+	if (eventSchedule.func != NULL)
+	    (*eventSchedule.func)();
 	return rxevent_get(ev);
     }