s4:ntvfs/common: s/private/private_data

metze

diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index cfbb88f90e1843b0a4b1b94541c4bb7936a87e26..12fe7015a75942cfca042e0b1ad58685553f0f96 100644 (file)
--- 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 179db111ca06dd6e60190c996b2948a4348469e8..446df1777fffefeb589c7a061be9d24722c12717 100644 (file)
--- 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 83da122fe2d851cf112cf7ceaa4ad6aa8d2e13ab..8f5d10f902808f8d76177246d3f9a62abc2495a4 100644 (file)
--- 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,