From f5ca3f11e47e48d195616f813b5b2c9e8255c6cd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 18 May 2012 09:10:02 +0200 Subject: s3: Revert the serverid changes, they need more work Autobuild-User: Volker Lendecke Autobuild-Date: Fri May 18 13:12:14 CEST 2012 on sn-devel-104 --- source3/smbd/close.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'source3/smbd/close.c') diff --git a/source3/smbd/close.c b/source3/smbd/close.c index e46e1aec89..c87b1a000b 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -179,15 +179,9 @@ static void notify_deferred_opens(struct smbd_server_connection *sconn, num_deferred = 0; for (i=0; idata->num_share_modes; i++) { - struct share_mode_entry *e = &lck->data->share_modes[i]; - - if (!is_deferred_open_entry(e)) { - continue; - } - if (share_mode_stale_pid(lck->data, i)) { - continue; + if (is_deferred_open_entry(&lck->data->share_modes[i])) { + num_deferred += 1; } - num_deferred += 1; } if (num_deferred == 0) { return; @@ -425,9 +419,6 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp, if (fsp->posix_open && (e->flags & SHARE_MODE_FLAG_POSIX_OPEN)) { continue; } - if (share_mode_stale_pid(lck->data, i)) { - continue; - } delete_file = False; break; } @@ -1078,9 +1069,6 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp, if (fsp->posix_open && (e->flags & SHARE_MODE_FLAG_POSIX_OPEN)) { continue; } - if (share_mode_stale_pid(lck->data, i)) { - continue; - } delete_dir = False; break; } -- cgit