sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

pvfs_wait: use struct pvfs_wait * instead of void *

Browse Source 
metze
(This used to be commit 3b70331536d2402814db13a9f1f226a39373313a)
This commit is contained in:
Stefan Metzmacher 2008-02-21 09:02:17 +01:00
parent fb6f52261a
commit a0a0d4a5d0
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/ntvfs/posix/pvfs_lock.c
View File

@ -53,7 +53,7 @@ struct pvfs_pending_lock {
struct pvfs_file *f;
struct ntvfs_request *req;
int pending_lock;
void *wait_handle;
struct pvfs_wait *wait_handle;
struct timeval end_time;
};

8
source4/ntvfs/posix/pvfs_notify.c
View File

@ -268,9 +268,11 @@ NTSTATUS pvfs_notify(struct ntvfs_module_context *ntvfs,
/* if the buffer is empty then start waiting */
if (f->notify_buffer->num_changes == 0) {
void *wait_handle =
pvfs_wait_message(pvfs, req, -1, timeval_zero(),
pvfs_notify_end, f->notify_buffer);
struct pvfs_wait *wait_handle;
wait_handle = pvfs_wait_message(pvfs, req, -1,
timeval_zero(),
pvfs_notify_end,
f->notify_buffer);
NT_STATUS_HAVE_NO_MEMORY(wait_handle);
talloc_steal(req, wait_handle);
return NT_STATUS_OK;

2
source4/ntvfs/posix/pvfs_open.c
View File

@ -756,7 +756,7 @@ struct pvfs_open_retry {
struct ntvfs_module_context *ntvfs;
struct ntvfs_request *req;
union smb_open *io;
void *wait_handle;
struct pvfs_wait *wait_handle;
DATA_BLOB odb_locking_key;
};

12
source4/ntvfs/posix/pvfs_wait.c
View File

@ -131,12 +131,12 @@ static int pvfs_wait_destructor(struct pvfs_wait *pwait)
if msg_type == -1 then no message is registered, and it is assumed
that the caller handles any messaging setup needed
*/
void *pvfs_wait_message(struct pvfs_state *pvfs,
struct ntvfs_request *req,
int msg_type,
struct timeval end_time,
void (*fn)(void *, enum pvfs_wait_notice),
void *private_data)
struct pvfs_wait *pvfs_wait_message(struct pvfs_state *pvfs,
struct ntvfs_request *req,
int msg_type,
struct timeval end_time,
void (*fn)(void *, enum pvfs_wait_notice),
void *private_data)
{
struct pvfs_wait *pwait;

2
source4/ntvfs/posix/vfs_posix.h
View File

@ -28,6 +28,8 @@
#include "ntvfs/common/ntvfs_common.h"
#include "dsdb/samdb/samdb.h"
struct pvfs_wait;
/* this is the private structure for the posix vfs backend. It is used
to hold per-connection (per tree connect) state information */
struct pvfs_state {