diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-07 08:12:54 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-08 10:56:26 +0200 |
| commit | 1969aa8eacd257951cdc8d13110302c3b9388013 (patch) | |
| tree | db36becce95919c7e94d524dd0fd31c5241c1d15 /source4/ntvfs/posix/pvfs_open.c | |
| parent | 5c3e985fb53e7e210d665a6fc8199b0844019340 (diff) | |
| download | samba-1969aa8eacd257951cdc8d13110302c3b9388013.tar.gz samba-1969aa8eacd257951cdc8d13110302c3b9388013.tar.bz2 samba-1969aa8eacd257951cdc8d13110302c3b9388013.zip | |
s4-ntvfs: Rename brl_*() -> brlock_*() to avoid conflict with brlock_init in s3
Diffstat (limited to 'source4/ntvfs/posix/pvfs_open.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 08a54f8e42..dfe2f2aa62 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -590,7 +590,7 @@ static NTSTATUS pvfs_brl_locking_handle(TALLOC_CTX *mem_ctx, data_blob_free(&odb_key); } - h = brl_create_handle(mem_ctx, ntvfs, &key); + h = brlock_create_handle(mem_ctx, ntvfs, &key); NT_STATUS_HAVE_NO_MEMORY(h); *_h = h; @@ -1569,7 +1569,7 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs, f->handle->fd = fd; - status = brl_count(f->pvfs->brl_context, f->brl_handle, &count); + status = brlock_count(f->pvfs->brl_context, f->brl_handle, &count); if (!NT_STATUS_IS_OK(status)) { talloc_free(lck); return status; |