From e6383f47629368d9dd4e803f17566a24e9d7359e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 7 May 2007 09:35:35 +0000 Subject: r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch. This changes "struct process_id" to "struct server_id", keeping both is just too much hassle. No functional change (I hope ;-)) Volker (This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8) --- source3/smbd/oplock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/smbd/oplock.c') diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 26ee52b797..8a84331810 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -391,7 +391,7 @@ static void add_oplock_timeout_handler(files_struct *fsp) the client for LEVEL2. *******************************************************************/ -static void process_oplock_async_level2_break_message(int msg_type, struct process_id src, +static void process_oplock_async_level2_break_message(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { @@ -478,7 +478,7 @@ static void process_oplock_async_level2_break_message(int msg_type, struct proce This handles the generic oplock break message from another smbd. *******************************************************************/ -static void process_oplock_break_message(int msg_type, struct process_id src, +static void process_oplock_break_message(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { @@ -587,7 +587,7 @@ static void process_oplock_break_message(int msg_type, struct process_id src, This handles the kernel oplock break message. *******************************************************************/ -static void process_kernel_oplock_break(int msg_type, struct process_id src, +static void process_kernel_oplock_break(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { @@ -679,7 +679,7 @@ void reply_to_oplock_break_requests(files_struct *fsp) return; } -static void process_oplock_break_response(int msg_type, struct process_id src, +static void process_oplock_break_response(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { @@ -707,7 +707,7 @@ static void process_oplock_break_response(int msg_type, struct process_id src, schedule_deferred_open_smb_message(msg.op_mid); } -static void process_open_retry_message(int msg_type, struct process_id src, +static void process_open_retry_message(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { -- cgit