s4-ntvfs: Rename brl_*() -> brlock_*() to avoid conflict with brlock_init in s3

4 files changed, 13 insertions, 13 deletions

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 11757deea4..76bc73dad8 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -39,7 +39,7 @@ NTSTATUS pvfs_check_lock(struct pvfs_state *pvfs,
 		return NT_STATUS_OK;
 	}
 
-	return brl_locktest(pvfs->brl_context,
+	return brlock_locktest(pvfs->brl_context,
 			    f->brl_handle,
 			    smbpid,
 			    offset, count, rw);
@@ -70,7 +70,7 @@ static void pvfs_lock_async_failed(struct pvfs_state *pvfs,
 {
 	/* undo the locks we just did */
 	for (i--;i>=0;i--) {
-		brl_unlock(pvfs->brl_context,
+		brlock_unlock(pvfs->brl_context,
 			   f->brl_handle,
 			   locks[i].pid,
 			   locks[i].offset,
@@ -127,7 +127,7 @@ static void pvfs_pending_lock_continue(void *private_data, enum pvfs_wait_notice
 		 * because with this we'll get the correct error code
 		 * FILE_LOCK_CONFLICT in the error case
 		 */
-		status = brl_lock(pvfs->brl_context,
+		status = brlock_lock(pvfs->brl_context,
 				  f->brl_handle,
 				  locks[pending->pending_lock].pid,
 				  locks[pending->pending_lock].offset,
@@ -143,7 +143,7 @@ static void pvfs_pending_lock_continue(void *private_data, enum pvfs_wait_notice
 	   don't need the pending lock any more */
 	if (NT_STATUS_IS_OK(status) || timed_out) {
 		NTSTATUS status2;
-		status2 = brl_remove_pending(pvfs->brl_context, 
+		status2 = brlock_remove_pending(pvfs->brl_context, 
 					     f->brl_handle, pending);
 		if (!NT_STATUS_IS_OK(status2)) {
 			DEBUG(0,("pvfs_lock: failed to remove pending lock - %s\n", nt_errstr(status2)));
@@ -177,7 +177,7 @@ static void pvfs_pending_lock_continue(void *private_data, enum pvfs_wait_notice
 			pending->pending_lock = i;
 		}
 
-		status = brl_lock(pvfs->brl_context,
+		status = brlock_lock(pvfs->brl_context,
 				  f->brl_handle,
 				  locks[i].pid,
 				  locks[i].offset,
@@ -225,7 +225,7 @@ void pvfs_lock_close(struct pvfs_state *pvfs, struct pvfs_file *f)
 	if (f->lock_count || f->pending_list) {
 		DEBUG(5,("pvfs_lock: removing %.0f locks on close\n", 
 			 (double)f->lock_count));
-		brl_close(f->pvfs->brl_context, f->brl_handle);
+		brlock_close(f->pvfs->brl_context, f->brl_handle);
 		f->lock_count = 0;
 	}
 
@@ -350,7 +350,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
 	locks = lck->lockx.in.locks;
 
 	for (i=0;i<lck->lockx.in.ulock_cnt;i++) {
-		status = brl_unlock(pvfs->brl_context,
+		status = brlock_unlock(pvfs->brl_context,
 				    f->brl_handle,
 				    locks[i].pid,
 				    locks[i].offset,
@@ -369,7 +369,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
 			pending->pending_lock = i;
 		}
 
-		status = brl_lock(pvfs->brl_context,
+		status = brlock_lock(pvfs->brl_context,
 				  f->brl_handle,
 				  locks[i].pid,
 				  locks[i].offset,
@@ -394,7 +394,7 @@ NTSTATUS pvfs_lock(struct ntvfs_module_context *ntvfs,
 
 			/* undo the locks we just did */
 			for (i--;i>=0;i--) {
-				brl_unlock(pvfs->brl_context,
+				brlock_unlock(pvfs->brl_context,
 					   f->brl_handle,
 					   locks[i].pid,
 					   locks[i].offset,
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;
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index b79ae957f3..4c1404eec5 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -249,7 +249,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
 
 	ntvfs->private_data = pvfs;
 
-	pvfs->brl_context = brl_init(pvfs, 
+	pvfs->brl_context = brlock_init(pvfs, 
 				     pvfs->ntvfs->ctx->server_id,
 				     pvfs->ntvfs->ctx->lp_ctx,
 				     pvfs->ntvfs->ctx->msg_ctx);
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index d60369df50..e1593a38cf 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -204,7 +204,7 @@ struct pvfs_file {
 	/* a file handle to be used for byte range locking */
 	struct brl_handle *brl_handle;
 
-	/* a count of active locks - used to avoid calling brl_close on
+	/* a count of active locks - used to avoid calling brlock_close on
 	   file close */
 	uint64_t lock_count;