summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-04-27 23:28:56 +0000
committerJeremy Allison <jra@samba.org>2000-04-27 23:28:56 +0000
commit4b60a33c6fa733060068e192b87c2e858103d6eb (patch)
treeeb92df9b35af4898e580ddd5ac657ef07d4015d3 /source3/include
parent36db78fedad935aaa689d52d7f58e075f1f71812 (diff)
downloadsamba-4b60a33c6fa733060068e192b87c2e858103d6eb.tar.gz
samba-4b60a33c6fa733060068e192b87c2e858103d6eb.tar.bz2
samba-4b60a33c6fa733060068e192b87c2e858103d6eb.zip
Ok - this is more subtle than it looks :-).
When a file is being closed, once it passes the fnum and tid tests then the locking context should be ignored when removing all locks. This is what is done in the brl close case, but when you have outstanding POSIX locks, then you cannot remove all the brl locks in one go, you have to get the lock list and call do_unlock individually. As this uses global_smbpid as the locking context, you need to make sure that this is set correctly for the specific lock being removed. I now do this by storing the smbpid in each entry in the unlock list returned from the query call. I removed the smbpid from fsp (not needed) and things seem ok (even with the stupid smbpid tricks that smbtorture plays :-). Jeremy. (This used to be commit 6baa96bb466915cc17e8cbad50254d6bd47b967b)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index e4415e7d22..78d17aaa3d 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -482,7 +482,6 @@ typedef struct files_struct
SMB_OFF_T size;
mode_t mode;
uint16 vuid;
- int smbpid;
write_bmpx_struct *wbmpx_ptr;
write_cache *wcp;
struct timeval open_time;
@@ -527,6 +526,7 @@ struct unlock_list {
struct unlock_list *prev;
SMB_BIG_UINT start;
SMB_BIG_UINT size;
+ uint16 smbpid;
};
typedef struct