s4:ntvfs/posix: s/private/private_data

metze

diff --git a/source4/ntvfs/posix/pvfs_aio.c b/source4/ntvfs/posix/pvfs_aio.c
index 7a090e214a9f9514658d89972d10473a9dc5bb3f..56566e35925af363a63f67571af2764d04d87995 100644 (file)
--- a/source4/ntvfs/posix/pvfs_aio.c
+++ b/source4/ntvfs/posix/pvfs_aio.c
@@ -42,9 +42,9 @@ struct pvfs_aio_write_state {
   called when an aio read has finished
 */
 static void pvfs_aio_read_handler(struct tevent_context *ev, struct tevent_aio *ae,
-                            int ret, void *private)
+                            int ret, void *private_data)
 {
-       struct pvfs_aio_read_state *state = talloc_get_type(private, 
+       struct pvfs_aio_read_state *state = talloc_get_type(private_data,
                                                            struct pvfs_aio_read_state);
        struct pvfs_file *f = state->f;
        union smb_read *rd = state->rd;
@@ -107,9 +107,9 @@ NTSTATUS pvfs_aio_pread(struct ntvfs_request *req, union smb_read *rd,
   called when an aio write has finished
 */
 static void pvfs_aio_write_handler(struct tevent_context *ev, struct tevent_aio *ae,
-                            int ret, void *private)
+                            int ret, void *private_data)
 {
-       struct pvfs_aio_write_state *state = talloc_get_type(private, 
+       struct pvfs_aio_write_state *state = talloc_get_type(private_data,
                                                            struct pvfs_aio_write_state);
        struct pvfs_file *f = state->f;
        union smb_write *wr = state->wr;

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 173b2fe187fdee8108b629ea57da02733afbff2f..2353baeff4aa38723344ac637145788724afce2b 100644 (file)
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -88,9 +88,9 @@ static void pvfs_lock_async_failed(struct pvfs_state *pvfs,
   range, so we should try the lock again. Note that on timeout we
   do retry the lock, giving it a last chance.
 */
-static void pvfs_pending_lock_continue(void *private, enum pvfs_wait_notice reason)
+static void pvfs_pending_lock_continue(void *private_data, enum pvfs_wait_notice reason)
 {
-       struct pvfs_pending_lock *pending = private;
+       struct pvfs_pending_lock *pending = private_data;
        struct pvfs_state *pvfs = pending->pvfs;
        struct pvfs_file *f = pending->f;
        struct ntvfs_request *req = pending->req;

diff --git a/source4/ntvfs/posix/pvfs_notify.c b/source4/ntvfs/posix/pvfs_notify.c
index 8224d36b7dd19ec424c2866438f0eefa4a6e57f3..09aa0f64e63e837ac985b92fa38ee38d53b59b2c 100644 (file)
--- a/source4/ntvfs/posix/pvfs_notify.c
+++ b/source4/ntvfs/posix/pvfs_notify.c
@@ -126,9 +126,9 @@ static int pvfs_notify_destructor(struct pvfs_notify_buffer *n)
 /*
   called when a async notify event comes in
 */
-static void pvfs_notify_callback(void *private, const struct notify_event *ev)
+static void pvfs_notify_callback(void *private_data, const struct notify_event *ev)
 {
-       struct pvfs_notify_buffer *n = talloc_get_type(private, struct pvfs_notify_buffer);
+       struct pvfs_notify_buffer *n = talloc_get_type(private_data, struct pvfs_notify_buffer);
        size_t len;
        struct notify_changes *n2;
        char *new_path;
@@ -201,9 +201,9 @@ static NTSTATUS pvfs_notify_setup(struct pvfs_state *pvfs, struct pvfs_file *f,
   called from the pvfs_wait code when either an event has come in, or
   the notify request has been cancelled
 */
-static void pvfs_notify_end(void *private, enum pvfs_wait_notice reason)
+static void pvfs_notify_end(void *private_data, enum pvfs_wait_notice reason)
 {
-       struct pvfs_notify_buffer *notify_buffer = talloc_get_type(private, 
+       struct pvfs_notify_buffer *notify_buffer = talloc_get_type(private_data,
                                                                   struct pvfs_notify_buffer);
        if (reason == PVFS_WAIT_CANCEL) {
                pvfs_notify_send(notify_buffer, NT_STATUS_CANCELLED, false);