diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-06-02 11:03:19 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-06-02 11:03:19 +1000 |
| commit | 1bdd08227e7d046305705050f21f0f1b6dd6994a (patch) | |
| tree | 1695bd1e4637c604727b3db89e805fb0edae1e9f /source4/ntvfs/common | |
| parent | 3850d47fef103c4118f1baff4b91b403ab4dde71 (diff) | |
| download | samba-1bdd08227e7d046305705050f21f0f1b6dd6994a.tar.gz | |
smbpid needs to be 32 bit now to cope with SMB2
(This used to be commit a2854fd6eaf097b5a9a562e0b8f1a599485fec42)
Diffstat (limited to 'source4/ntvfs/common')
| -rw-r--r-- | source4/ntvfs/common/brlock.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/common/brlock_tdb.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c index c87eca8aff3..3b348731520 100644 --- a/source4/ntvfs/common/brlock.c +++ b/source4/ntvfs/common/brlock.c @@ -109,7 +109,7 @@ NTSTATUS brl_remove_pending(struct brl_context *brl, */ NTSTATUS brl_locktest(struct brl_context *brl, struct brl_handle *brlh, - uint16_t smbpid, + uint32_t smbpid, uint64_t start, uint64_t size, enum brl_type lock_type) { diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c index 362a6d01e24..c94b9b446e6 100644 --- a/source4/ntvfs/common/brlock_tdb.c +++ b/source4/ntvfs/common/brlock_tdb.c @@ -57,7 +57,7 @@ struct brl_context { */ struct lock_context { struct server_id server; - uint16_t smbpid; + uint32_t smbpid; struct brl_context *ctx; }; @@ -286,7 +286,7 @@ static NTSTATUS brl_tdb_lock_failed(struct brl_handle *brlh, struct lock_struct */ static NTSTATUS brl_tdb_lock(struct brl_context *brl, struct brl_handle *brlh, - uint16_t smbpid, + uint32_t smbpid, uint64_t start, uint64_t size, enum brl_type lock_type, void *notify_ptr) @@ -436,7 +436,7 @@ static void brl_tdb_notify_all(struct brl_context *brl, */ static NTSTATUS brl_tdb_unlock(struct brl_context *brl, struct brl_handle *brlh, - uint16_t smbpid, + uint32_t smbpid, uint64_t start, uint64_t size) { TDB_DATA kbuf, dbuf; @@ -581,7 +581,7 @@ static NTSTATUS brl_tdb_remove_pending(struct brl_context *brl, */ static NTSTATUS brl_tdb_locktest(struct brl_context *brl, struct brl_handle *brlh, - uint16_t smbpid, + uint32_t smbpid, uint64_t start, uint64_t size, enum brl_type lock_type) { |