sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s3: smbd: inline dptr_close_internal()

Browse Source 
There's now only one caller left.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2019-08-04 09:21:55 +02:00
parent 7d72cf02e7
commit 3e0cafc2b5
1 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
source3/smbd/dir.c
View File

@ -170,43 +170,6 @@ uint16_t dptr_attr(struct smbd_server_connection *sconn, int key)
return(0);
}
/****************************************************************************
Close a dptr (internal func).
****************************************************************************/
static void dptr_close_internal(struct dptr_struct *dptr)
{
struct smbd_server_connection *sconn = dptr->conn->sconn;
DEBUG(4,("closing dptr key %d\n",dptr->dnum));
if (sconn == NULL) {
goto done;
}
if (sconn->using_smb2) {
goto done;
}
DLIST_REMOVE(sconn->searches.dirptrs, dptr);
/*
* Free the dnum in the bitmap. Remember the dnum value is always
* biased by one with respect to the bitmap.
*/
if (!bitmap_query(sconn->searches.dptr_bmap, dptr->dnum - 1)) {
DEBUG(0,("dptr_close_internal : Error - closing dnum = %d and bitmap not set !\n",
dptr->dnum ));
}
bitmap_clear(sconn->searches.dptr_bmap, dptr->dnum - 1);
done:
TALLOC_FREE(dptr->dir_hnd);
TALLOC_FREE(dptr);
}
/****************************************************************************
Close all dptrs for a cnum.
****************************************************************************/
@ -370,6 +333,8 @@ done:
void dptr_CloseDir(files_struct *fsp)
{
struct smbd_server_connection *sconn = fsp->dptr->conn->sconn;
if (fsp->dptr == NULL) {
return;
}
@ -379,8 +344,28 @@ void dptr_CloseDir(files_struct *fsp)
* now handles all resource deallocation.
*/
dptr_close_internal(fsp->dptr);
fsp->dptr = NULL;
DBG_INFO("closing dptr key %d\n", fsp->dptr->dnum);
if (sconn != NULL && !sconn->using_smb2) {
DLIST_REMOVE(sconn->searches.dirptrs, fsp->dptr);
/*
* Free the dnum in the bitmap. Remember the dnum value is
* always biased by one with respect to the bitmap.
*/
if (!bitmap_query(sconn->searches.dptr_bmap,
fsp->dptr->dnum - 1))
{
DBG_ERR("closing dnum = %d and bitmap not set !\n",
fsp->dptr->dnum);
}
bitmap_clear(sconn->searches.dptr_bmap, fsp->dptr->dnum - 1);
}
TALLOC_FREE(fsp->dptr->dir_hnd);
TALLOC_FREE(fsp->dptr);
}
void dptr_SeekDir(struct dptr_struct *dptr, long offset)