summaryrefslogtreecommitdiff
path: root/source3/smbd/close.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-08-21 01:30:29 +0000
committerJeremy Allison <jra@samba.org>1998-08-21 01:30:29 +0000
commit81b580fd2248221c61e3d4dac03862fb1fd8fde5 (patch)
tree4dc0f808dc127beda15184b06506d11b701bbcee /source3/smbd/close.c
parentdc76502cd8a950f6aff84ce4eedfd9d2b30d3dcc (diff)
downloadsamba-81b580fd2248221c61e3d4dac03862fb1fd8fde5.tar.gz
samba-81b580fd2248221c61e3d4dac03862fb1fd8fde5.tar.bz2
samba-81b580fd2248221c61e3d4dac03862fb1fd8fde5.zip
Fixes for the problem in blocking locks with file_fsp returning the
chain_fsp on close (if you don't know what this means, consider yourself lucky - this one took a day to track down :-). Jeremy. (This used to be commit 193cb5382464173e99a538867a266d793f0ceab5)
Diffstat (limited to 'source3/smbd/close.c')
-rw-r--r--source3/smbd/close.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index b8063ca3f4..07b000d7ad 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -104,6 +104,8 @@ void close_file(files_struct *fsp, BOOL normal_close)
int token;
connection_struct *conn = fsp->conn;
+ remove_pending_lock_requests_by_fid(fsp);
+
close_filestruct(fsp);
#if USE_READ_PREDICTION
@@ -142,8 +144,6 @@ void close_file(files_struct *fsp, BOOL normal_close)
string_free(&fsp->fsp_name);
}
- remove_pending_lock_requests_by_fid(fsp);
-
file_free(fsp);
}