diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-18 11:47:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:00:00 -0500 |
| commit | 384f87bd38c1133c90e2a57775f139532574e3cc (patch) | |
| tree | 620191b0984eb721361e33b61301156fd140329c /source4/lib | |
| parent | a03a7d0aea2884d4bf0e3fa993acf39189a37ddf (diff) | |
| download | samba-384f87bd38c1133c90e2a57775f139532574e3cc.tar.gz samba-384f87bd38c1133c90e2a57775f139532574e3cc.tar.bz2 samba-384f87bd38c1133c90e2a57775f139532574e3cc.zip | |
r3034: - fixed a bug in message dispatch, when the dispatch function called messaging_deregister()
- added a pvfs_lock_close_pending() hook to remove pending locks on file close
- fixed the private ptr argument to messaging_deregister() in pvfs_wait
- fixed a bug in continuing lock requests after a lock that is blocking a pending lock is removed
- removed bogus brl_unlock() call in lock continue
- corrected error code for LOCKING_ANDX_CHANGE_LOCKTYPE
- expanded the lock cancel test suite to test lock cancel by unlock and by close
- added a testsuite for LOCKING_ANDX_CHANGE_LOCKTYPE
(This used to be commit 5ef80f034d4aa4dd6810532c63ad041bfc019cb8)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/messaging/messaging.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index e78ec83b4b..b0ca9cc41e 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -95,8 +95,9 @@ static char *messaging_path(TALLOC_CTX *mem_ctx, servid_t server_id) */ static void messaging_dispatch(struct messaging_state *msg, struct messaging_rec *rec) { - struct dispatch_fn *d; - for (d=msg->dispatch;d;d=d->next) { + struct dispatch_fn *d, *next; + for (d=msg->dispatch;d;d=next) { + next = d->next; if (d->msg_type == rec->header.msg_type) { d->fn(msg, d->private, d->msg_type, rec->header.from, &rec->data); } |