From 3a66ee1ae583520a1dea50883038de3ec82169ba Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 24 May 2012 23:32:04 +0200 Subject: [PATCH] s3:smbd: pass smbd_server_connection to should_notify_deferred_opens() metze --- source3/smbd/close.c | 2 +- source3/smbd/oplock.c | 2 +- source3/smbd/proto.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/smbd/close.c b/source3/smbd/close.c index ede7925fc03..22d756c5c12 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -173,7 +173,7 @@ static void notify_deferred_opens(struct smbd_server_connection *sconn, uint32_t i, num_deferred; struct share_mode_entry *deferred; - if (!should_notify_deferred_opens()) { + if (!should_notify_deferred_opens(sconn)) { return; } diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 3cfc81291b9..3705943474a 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -208,7 +208,7 @@ bool downgrade_oplock(files_struct *fsp) /* * Some kernel oplock implementations handle the notification themselves. */ -bool should_notify_deferred_opens() +bool should_notify_deferred_opens(struct smbd_server_connection *sconn) { return !(koplocks && (koplocks->flags & KOPLOCKS_DEFERRED_OPEN_NOTIFICATION)); diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index eb98bc86c5e..7fdbbea2135 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -667,7 +667,7 @@ bool set_file_oplock(files_struct *fsp, int oplock_type); void release_file_oplock(files_struct *fsp); bool remove_oplock(files_struct *fsp); bool downgrade_oplock(files_struct *fsp); -bool should_notify_deferred_opens(void); +bool should_notify_deferred_opens(struct smbd_server_connection *sconn); void break_level2_to_none_async(files_struct *fsp); void reply_to_oplock_break_requests(files_struct *fsp); void contend_level2_oplocks_begin(files_struct *fsp, -- 2.11.4.GIT