summaryrefslogtreecommitdiff
path: root/source3/smbd/close.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-08-19 01:49:34 +0000
committerJeremy Allison <jra@samba.org>1998-08-19 01:49:34 +0000
commit12de4034c72ea5054d716bf848c2b16bef7a4d89 (patch)
tree55a877cb872f4c2584905f02ba2f42d3bbddb9b1 /source3/smbd/close.c
parent1e6837837ac402702ccadcbcfd853b8c673c783a (diff)
downloadsamba-12de4034c72ea5054d716bf848c2b16bef7a4d89.tar.gz
samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.tar.bz2
samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.zip
Makefile.in: Moved blocking lock code into smbd/blocking.c for link purposes.
include/includes.h: Added nterr.h. locking/locking.c: Moved blocking lock code into smbd/blocking.c for link purposes. smbd/close.c: Added blocking lock removal to file close. smbd/filename.c: Tidied up unix_convert() so I could read it (:-) in preparation for the stat_cache code. smbd/nttrans.c: Added WRITE_ATTRIBUTES check. smbd/reply.c: Fixed multibyte char problem in wildcard mask. Jeremy. (This used to be commit 148eaba3dadb1d0bd3ac3ef53da3d9811636e89a)
Diffstat (limited to 'source3/smbd/close.c')
-rw-r--r--source3/smbd/close.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 9bc0a89338..b8063ca3f4 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -142,6 +142,8 @@ void close_file(files_struct *fsp, BOOL normal_close)
string_free(&fsp->fsp_name);
}
+ remove_pending_lock_requests_by_fid(fsp);
+
file_free(fsp);
}
@@ -151,10 +153,6 @@ void close_file(files_struct *fsp, BOOL normal_close)
void close_directory(files_struct *fsp)
{
- /* TODO - walk the list of pending
- change notify requests and free
- any pertaining to this fsp. */
-
remove_pending_change_notify_requests_by_fid(fsp);
/*