s4:ntvfs/common: s/private/private_data

metze

3 files changed, 10 insertions, 10 deletions

diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index cfbb88f90e..12fe7015a7 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -107,9 +107,9 @@ NTSTATUS odb_open_file(struct odb_lock *lck,
 /*
   register a pending open file in the open files database
 */
-NTSTATUS odb_open_file_pending(struct odb_lock *lck, void *private)
+NTSTATUS odb_open_file_pending(struct odb_lock *lck, void *private_data)
 {
-	return ops->odb_open_file_pending(lck, private);
+	return ops->odb_open_file_pending(lck, private_data);
 }
 
 
@@ -126,9 +126,9 @@ NTSTATUS odb_close_file(struct odb_lock *lck, void *file_handle,
 /*
   remove a pending opendb entry
 */
-NTSTATUS odb_remove_pending(struct odb_lock *lck, void *private)
+NTSTATUS odb_remove_pending(struct odb_lock *lck, void *private_data)
 {
-	return ops->odb_remove_pending(lck, private);
+	return ops->odb_remove_pending(lck, private_data);
 }
 
 
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h
index 179db111ca..446df1777f 100644
--- a/source4/ntvfs/common/opendb.h
+++ b/source4/ntvfs/common/opendb.h
@@ -30,10 +30,10 @@ struct opendb_ops {
 				  int *fd, NTTIME open_write_time,
 				  bool allow_level_II_oplock,
 				  uint32_t oplock_level, uint32_t *oplock_granted);
-	NTSTATUS (*odb_open_file_pending)(struct odb_lock *lck, void *private);
+	NTSTATUS (*odb_open_file_pending)(struct odb_lock *lck, void *private_data);
 	NTSTATUS (*odb_close_file)(struct odb_lock *lck, void *file_handle,
 				   const char **delete_path);
-	NTSTATUS (*odb_remove_pending)(struct odb_lock *lck, void *private);
+	NTSTATUS (*odb_remove_pending)(struct odb_lock *lck, void *private_data);
 	NTSTATUS (*odb_rename)(struct odb_lock *lck, const char *path);
 	NTSTATUS (*odb_get_path)(struct odb_lock *lck, const char **path);
 	NTSTATUS (*odb_set_delete_on_close)(struct odb_lock *lck, bool del_on_close);
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 83da122fe2..8f5d10f902 100644
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -548,7 +548,7 @@ static NTSTATUS odb_tdb_open_file(struct odb_lock *lck,
 /*
   register a pending open file in the open files database
 */
-static NTSTATUS odb_tdb_open_file_pending(struct odb_lock *lck, void *private)
+static NTSTATUS odb_tdb_open_file_pending(struct odb_lock *lck, void *private_data)
 {
 	struct odb_context *odb = lck->odb;
 
@@ -562,7 +562,7 @@ static NTSTATUS odb_tdb_open_file_pending(struct odb_lock *lck, void *private)
 	NT_STATUS_HAVE_NO_MEMORY(lck->file.pending);
 
 	lck->file.pending[lck->file.num_pending].server = odb->ntvfs_ctx->server_id;
-	lck->file.pending[lck->file.num_pending].notify_ptr = private;
+	lck->file.pending[lck->file.num_pending].notify_ptr = private_data;
 
 	lck->file.num_pending++;
 
@@ -710,7 +710,7 @@ static NTSTATUS odb_tdb_break_oplocks(struct odb_lock *lck)
 /*
   remove a pending opendb entry
 */
-static NTSTATUS odb_tdb_remove_pending(struct odb_lock *lck, void *private)
+static NTSTATUS odb_tdb_remove_pending(struct odb_lock *lck, void *private_data)
 {
 	struct odb_context *odb = lck->odb;
 	int i;
@@ -721,7 +721,7 @@ static NTSTATUS odb_tdb_remove_pending(struct odb_lock *lck, void *private)
 
 	/* find the entry, and delete it */
 	for (i=0;i<lck->file.num_pending;i++) {
-		if (private == lck->file.pending[i].notify_ptr &&
+		if (private_data == lck->file.pending[i].notify_ptr &&
 		    cluster_id_equal(&odb->ntvfs_ctx->server_id, &lck->file.pending[i].server)) {
 			if (i < lck->file.num_pending-1) {
 				memmove(lck->file.pending+i, lck->file.pending+i+1,