From: Jeremy Allison <jra@samba.org>
Date: Mon, 8 Jul 2019 22:15:24 +0000 (-0700)
Subject: s3: smbd: We no longer need to keep a count of dirhandles open.
X-Git-Tag: talloc-2.3.0~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9d00ad068c5814e13c68c7fe42d75242f899f0d;p=thirdparty%2Fsamba.git

s3: smbd: We no longer need to keep a count of dirhandles open.

It's not per-connection struct anyway, so doesn't
help for anything.

Remove now unused variable struct smbd_server_connection *sconn
otherwise we get compile errors.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index b6b7f40bb81..9f3286df5ab 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1574,9 +1574,6 @@ static int smb_Dir_destructor(struct smb_Dir *dirp)
 			dirp->fsp = NULL;
 		}
 	}
-	if (dirp->conn->sconn && !dirp->conn->sconn->using_smb2) {
-		dirp->conn->sconn->searches.dirhandles_open--;
-	}
 	return 0;
 }
 
@@ -1591,7 +1588,6 @@ static struct smb_Dir *OpenDir_internal(TALLOC_CTX *mem_ctx,
 			uint32_t attr)
 {
 	struct smb_Dir *dirp = talloc_zero(mem_ctx, struct smb_Dir);
-	struct smbd_server_connection *sconn = conn->sconn;
 
 	if (!dirp) {
 		return NULL;
@@ -1618,9 +1614,6 @@ static struct smb_Dir *OpenDir_internal(TALLOC_CTX *mem_ctx,
 		dirp->name_cache_size = lp_directory_name_cache_size(SNUM(conn));
 	}
 
-	if (sconn && !sconn->using_smb2) {
-		sconn->searches.dirhandles_open++;
-	}
 	talloc_set_destructor(dirp, smb_Dir_destructor);
 
 	return dirp;
@@ -1721,7 +1714,6 @@ static struct smb_Dir *OpenDir_fsp(TALLOC_CTX *mem_ctx, connection_struct *conn,
 			uint32_t attr)
 {
 	struct smb_Dir *dirp = talloc_zero(mem_ctx, struct smb_Dir);
-	struct smbd_server_connection *sconn = conn->sconn;
 
 	if (!dirp) {
 		goto fail;
@@ -1778,9 +1770,6 @@ static struct smb_Dir *OpenDir_fsp(TALLOC_CTX *mem_ctx, connection_struct *conn,
 					attr);
 	}
 
-	if (sconn && !sconn->using_smb2) {
-		sconn->searches.dirhandles_open++;
-	}
 	talloc_set_destructor(dirp, smb_Dir_destructor);
 
 	return dirp;