3 files changed, 11 insertions, 11 deletions

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index efb70226e6..142b4ff799 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -38,7 +38,7 @@ static const struct brlock_ops *ops;
 /*
   set the brl backend ops
 */
-void brl_set_ops(const struct brlock_ops *new_ops)
+void brlock_set_ops(const struct brlock_ops *new_ops)
 {
 	ops = new_ops;
 }
@@ -47,7 +47,7 @@ void brl_set_ops(const struct brlock_ops *new_ops)
   Open up the brlock database. Close it down using talloc_free(). We
   need the imessaging_ctx to allow for pending lock notifications.
 */
-struct brl_context *brl_init(TALLOC_CTX *mem_ctx, struct server_id server, 
+struct brl_context *brlock_init(TALLOC_CTX *mem_ctx, struct server_id server, 
 			     struct loadparm_context *lp_ctx,
 			     struct imessaging_context *imessaging_ctx)
 {
@@ -57,7 +57,7 @@ struct brl_context *brl_init(TALLOC_CTX *mem_ctx, struct server_id server,
 	return ops->brl_init(mem_ctx, server, lp_ctx, imessaging_ctx);
 }
 
-struct brl_handle *brl_create_handle(TALLOC_CTX *mem_ctx, struct ntvfs_handle *ntvfs, DATA_BLOB *file_key)
+struct brl_handle *brlock_create_handle(TALLOC_CTX *mem_ctx, struct ntvfs_handle *ntvfs, DATA_BLOB *file_key)
 {
 	return ops->brl_create_handle(mem_ctx, ntvfs, file_key);
 }
@@ -69,7 +69,7 @@ struct brl_handle *brl_create_handle(TALLOC_CTX *mem_ctx, struct ntvfs_handle *n
   someone else closing an overlapping lock range) a messaging
   notification is sent, identified by the notify_ptr
 */
-NTSTATUS brl_lock(struct brl_context *brl,
+NTSTATUS brlock_lock(struct brl_context *brl,
 		  struct brl_handle *brlh,
 		  uint32_t smbpid,
 		  uint64_t start, uint64_t size, 
@@ -83,7 +83,7 @@ NTSTATUS brl_lock(struct brl_context *brl,
 /*
  Unlock a range of bytes.
 */
-NTSTATUS brl_unlock(struct brl_context *brl,
+NTSTATUS brlock_unlock(struct brl_context *brl,
 		    struct brl_handle *brlh, 
 		    uint32_t smbpid,
 		    uint64_t start, uint64_t size)
@@ -96,7 +96,7 @@ NTSTATUS brl_unlock(struct brl_context *brl,
   given up trying to establish a lock or when they have succeeded in
   getting it. In either case they no longer need to be notified.
 */
-NTSTATUS brl_remove_pending(struct brl_context *brl,
+NTSTATUS brlock_remove_pending(struct brl_context *brl,
 			    struct brl_handle *brlh, 
 			    void *notify_ptr)
 {
@@ -107,7 +107,7 @@ NTSTATUS brl_remove_pending(struct brl_context *brl,
 /*
   Test if we are allowed to perform IO on a region of an open file
 */
-NTSTATUS brl_locktest(struct brl_context *brl,
+NTSTATUS brlock_locktest(struct brl_context *brl,
 		      struct brl_handle *brlh,
 		      uint32_t smbpid, 
 		      uint64_t start, uint64_t size, 
@@ -120,7 +120,7 @@ NTSTATUS brl_locktest(struct brl_context *brl,
 /*
  Remove any locks associated with a open file.
 */
-NTSTATUS brl_close(struct brl_context *brl,
+NTSTATUS brlock_close(struct brl_context *brl,
 		   struct brl_handle *brlh)
 {
 	return ops->brl_close(brl, brlh);
@@ -129,7 +129,7 @@ NTSTATUS brl_close(struct brl_context *brl,
 /*
  Get a number of locks associated with a open file.
 */
-NTSTATUS brl_count(struct brl_context *brl,
+NTSTATUS brlock_count(struct brl_context *brl,
 		   struct brl_handle *brlh,
 		   int *count)
 {
diff --git a/source4/ntvfs/common/brlock.h b/source4/ntvfs/common/brlock.h
index 7ae3111cc4..703538f073 100644
--- a/source4/ntvfs/common/brlock.h
+++ b/source4/ntvfs/common/brlock.h
@@ -52,7 +52,7 @@ struct brlock_ops {
 };
 
 
-void brl_set_ops(const struct brlock_ops *new_ops);
+void brlock_set_ops(const struct brlock_ops *new_ops);
 void brl_tdb_init_ops(void);
 void brl_ctdb_init_ops(void);
 
diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index ab4d91c4db..3fd0edcc69 100644
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -779,5 +779,5 @@ static const struct brlock_ops brlock_tdb_ops = {
 
 void brl_tdb_init_ops(void)
 {
-	brl_set_ops(&brlock_tdb_ops);
+	brlock_set_ops(&brlock_tdb_ops);
 }