diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-17 02:55:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:57 -0500 |
| commit | fef617c31bd4a8be09449d6bc726c729ae758423 (patch) | |
| tree | 4951f62b04442e046f786b88e76dc48aac901e3f /source4/include | |
| parent | f6da6a10de7d7f101f6485f4a34ef4ef5b6ab6c0 (diff) | |
| download | samba-fef617c31bd4a8be09449d6bc726c729ae758423.tar.gz samba-fef617c31bd4a8be09449d6bc726c729ae758423.tar.bz2 samba-fef617c31bd4a8be09449d6bc726c729ae758423.zip | |
r3012: added initial support for byte range locking in the posix vfs. This is
enough for us to pass locktest, but does not yet support lock timeouts
and some of the other esoteric features.
(This used to be commit 58a92abd88f190bc60894a68e0528e95ae33fe39)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/smb.h | 2 | ||||
| -rw-r--r-- | source4/include/smb_interfaces.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/include/smb.h b/source4/include/smb.h index 46b2dd03ca..745e90e4ff 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -611,6 +611,6 @@ typedef struct nt_user_token { #define REQ_CONTROL_ASYNC (1<<2) /* the backend will answer this one later */ /* passed to br lock code */ -enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_LOCK}; +enum brl_type {READ_LOCK, WRITE_LOCK}; #endif /* _SMB_H */ diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h index 4acdf51b56..e9f51ba4d1 100644 --- a/source4/include/smb_interfaces.h +++ b/source4/include/smb_interfaces.h @@ -1450,7 +1450,9 @@ union smb_lock { /* generic interface */ struct { enum smb_lock_level level; - + struct { + uint16_t fnum; + } in; } generic; /* SMBlock interface */ |