diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-05 22:03:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-05 22:03:17 +0200 |
| commit | d51904c48970265e84c303ae97502152b85da587 (patch) | |
| tree | dfb75ae9712bac4ab6e25bd3bb3d79b6465685f0 /source4/ntvfs/common/brlock.c | |
| parent | d05ca8cbba364b65780d35a32495d6388bc3caa8 (diff) | |
| parent | c6cc3cb88ec271da6c372ec881ea66ab8f6e2b68 (diff) | |
| download | samba-d51904c48970265e84c303ae97502152b85da587.tar.gz samba-d51904c48970265e84c303ae97502152b85da587.tar.bz2 samba-d51904c48970265e84c303ae97502152b85da587.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit dcdfee611ccc0ae798e3eea2cfdf3c7642dc5677)
Diffstat (limited to 'source4/ntvfs/common/brlock.c')
| -rw-r--r-- | source4/ntvfs/common/brlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c index c87eca8aff..3b34873152 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) { |