diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-03-08 09:12:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-03-12 17:35:04 +0100 |
| commit | 59917521e9d811efe7b424d49f03fb972ee0a119 (patch) | |
| tree | fd2fdffe04865fac97bfb4f40ab08a6090468bfd /source4/ntvfs | |
| parent | 7cdf28ebaccb41a23c2986b123624b238effcfda (diff) | |
| download | samba-59917521e9d811efe7b424d49f03fb972ee0a119.tar.gz samba-59917521e9d811efe7b424d49f03fb972ee0a119.tar.bz2 samba-59917521e9d811efe7b424d49f03fb972ee0a119.zip | |
opendb: pass down a pointer to the fd in odb_open_file()
This prepares kernel oplock support.
metze
(This used to be commit 9db9b6d85d80a8aaa8bd432afaef9bb634d7364d)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/common/opendb.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/common/opendb.h | 2 | ||||
| -rw-r--r-- | source4/ntvfs/common/opendb_tdb.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c index 1cc077137c..676706e03f 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -97,11 +97,11 @@ _PUBLIC_ DATA_BLOB odb_get_key(TALLOC_CTX *mem_ctx, struct odb_lock *lck) */ _PUBLIC_ NTSTATUS odb_open_file(struct odb_lock *lck, void *file_handle, const char *path, - bool allow_level_II_oplock, + int *fd, bool allow_level_II_oplock, uint32_t oplock_level, uint32_t *oplock_granted) { return ops->odb_open_file(lck, file_handle, path, - allow_level_II_oplock, + fd, allow_level_II_oplock, oplock_level, oplock_granted); } diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h index fb3223aea9..045476337a 100644 --- a/source4/ntvfs/common/opendb.h +++ b/source4/ntvfs/common/opendb.h @@ -27,7 +27,7 @@ struct opendb_ops { DATA_BLOB (*odb_get_key)(TALLOC_CTX *mem_ctx, struct odb_lock *lck); NTSTATUS (*odb_open_file)(struct odb_lock *lck, void *file_handle, const char *path, - bool allow_level_II_oplock, + int *fd, 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_close_file)(struct odb_lock *lck, void *file_handle, diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index 17fcdfbbb4..9b4a5bfa9f 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -442,7 +442,7 @@ static NTSTATUS odb_tdb_open_can_internal(struct odb_context *odb, */ static NTSTATUS odb_tdb_open_file(struct odb_lock *lck, void *file_handle, const char *path, - bool allow_level_II_oplock, + int *fd, bool allow_level_II_oplock, uint32_t oplock_level, uint32_t *oplock_granted) { struct odb_context *odb = lck->odb; @@ -504,6 +504,7 @@ static NTSTATUS odb_tdb_open_file(struct odb_lock *lck, } lck->can_open.e->file_handle = file_handle; + lck->can_open.e->fd = fd; lck->can_open.e->allow_level_II_oplock = allow_level_II_oplock; lck->can_open.e->oplock_level = oplock_level; @@ -800,6 +801,7 @@ static NTSTATUS odb_tdb_can_open(struct odb_lock *lck, lck->can_open.e->server = odb->ntvfs_ctx->server_id; lck->can_open.e->file_handle = NULL; + lck->can_open.e->fd = NULL; lck->can_open.e->stream_id = stream_id; lck->can_open.e->share_access = share_access; lck->can_open.e->access_mask = access_mask; |