diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-09 16:51:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-09 16:51:46 +0100 |
| commit | 9b366d703210b493aa1389bbdd288a2b00958766 (patch) | |
| tree | 12acaf89af2c6bd2610018d267e2d8030d9b4bd6 /source4/ntvfs/posix/pvfs_open.c | |
| parent | 6d139ca4680abcbda5110f2f0886aa038ff62088 (diff) | |
| parent | 1dadf17be847e3f93b72988bcc7e8620a8d5908c (diff) | |
| download | samba-9b366d703210b493aa1389bbdd288a2b00958766.tar.gz samba-9b366d703210b493aa1389bbdd288a2b00958766.tar.xz samba-9b366d703210b493aa1389bbdd288a2b00958766.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/ntvfs/posix/pvfs_open.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index fe3c915576f..12f50fcc97e 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -868,7 +868,8 @@ struct pvfs_odb_retry { /* destroy a pending request */ static int pvfs_odb_retry_destructor(struct pvfs_odb_retry *r) { - struct pvfs_state *pvfs = r->ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(r->ntvfs->private_data, + struct pvfs_state); if (r->odb_locking_key.data) { struct odb_lock *lck; lck = odb_lock(r->req, pvfs->odb_context, &r->odb_locking_key); @@ -913,7 +914,8 @@ NTSTATUS pvfs_odb_retry_setup(struct ntvfs_module_context *ntvfs, void *private_data, enum pvfs_wait_notice reason)) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); struct pvfs_odb_retry *r; struct pvfs_wait *wait_handle; NTSTATUS status; @@ -1039,7 +1041,8 @@ static NTSTATUS pvfs_open_deny_dos(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req, union smb_open *io, struct pvfs_file *f, struct odb_lock *lck) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); struct pvfs_file *f2; struct pvfs_filename *name; NTSTATUS status; @@ -1120,7 +1123,8 @@ static NTSTATUS pvfs_open_setup_retry(struct ntvfs_module_context *ntvfs, struct odb_lock *lck, NTSTATUS parent_status) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); NTSTATUS status; struct timeval end_time; struct timeval *final_timeout = NULL; @@ -1174,7 +1178,8 @@ static NTSTATUS pvfs_open_setup_retry(struct ntvfs_module_context *ntvfs, NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req, union smb_open *io) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); int flags = 0; struct pvfs_filename *name; struct pvfs_file *f; @@ -1627,7 +1632,8 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs, NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req, union smb_close *io) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); struct pvfs_file *f; if (io->generic.level == RAW_CLOSE_SPLCLOSE) { @@ -1684,7 +1690,8 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs, NTSTATUS pvfs_logoff(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); struct pvfs_file *f, *next; for (f=pvfs->files.list;f;f=next) { @@ -1704,7 +1711,8 @@ NTSTATUS pvfs_logoff(struct ntvfs_module_context *ntvfs, NTSTATUS pvfs_exit(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req) { - struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, + struct pvfs_state); struct pvfs_file *f, *next; for (f=pvfs->files.list;f;f=next) { |