diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-12-13 09:24:31 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-12-14 12:00:06 +0100 |
| commit | 2e0bc74a6e88a2689e281e2767627c8773b380e4 (patch) | |
| tree | 30660d12ed751bd2cd947a3d2e713416fd764119 /source3 | |
| parent | c51da257699e7900aa2069eb71eb530e66f35fcc (diff) | |
| download | samba-2e0bc74a6e88a2689e281e2767627c8773b380e4.tar.gz samba-2e0bc74a6e88a2689e281e2767627c8773b380e4.tar.bz2 samba-2e0bc74a6e88a2689e281e2767627c8773b380e4.zip | |
s3:smbd: remove brl_register_msgs()
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/locking/brlock.c | 16 | ||||
| -rw-r--r-- | source3/locking/proto.h | 6 | ||||
| -rw-r--r-- | source3/smbd/server.c | 3 |
3 files changed, 12 insertions, 13 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index efc58c3891..33c92438cd 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1926,11 +1926,11 @@ static int compare_procids(const void *p1, const void *p2) * array, then qsort that array and only send to non-dupes. */ -static void brl_revalidate(struct messaging_context *msg_ctx, - void *private_data, - uint32_t msg_type, - struct server_id server_id, - DATA_BLOB *data) +void brl_revalidate(struct messaging_context *msg_ctx, + void *private_data, + uint32_t msg_type, + struct server_id server_id, + DATA_BLOB *data) { struct brl_revalidate_state *state; uint32 i; @@ -1973,9 +1973,3 @@ static void brl_revalidate(struct messaging_context *msg_ctx, TALLOC_FREE(state); return; } - -void brl_register_msgs(struct messaging_context *msg_ctx) -{ - messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE, - brl_revalidate); -} diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 5be8acc920..2c01634d31 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -90,7 +90,11 @@ int brl_forall(void (*fn)(struct file_id id, struct server_id pid, struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx, files_struct *fsp); struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp); -void brl_register_msgs(struct messaging_context *msg_ctx); +void brl_revalidate(struct messaging_context *msg_ctx, + void *private_data, + uint32_t msg_type, + struct server_id server_id, + DATA_BLOB *data); /* The following definitions come from locking/locking.c */ diff --git a/source3/smbd/server.c b/source3/smbd/server.c index f351b99501..07d2b3ebff 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -765,7 +765,8 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent, messaging_register(msg_ctx, NULL, MSG_DEBUG, smbd_msg_debug); messaging_register(msg_ctx, ev_ctx, MSG_PRINTER_PCAP, smb_pcap_updated); - brl_register_msgs(msg_ctx); + messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE, + brl_revalidate); msg_idmap_register_msg(msg_ctx); |