diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 13:07:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 13:07:55 +0100 |
| commit | a999a1fc996234555bd2d8a4a873b39d111c347e (patch) | |
| tree | 737b0bf68f6a93d6e835676b96b8bb3c606d1c91 /source4/ntvfs/common/opendb.h | |
| parent | 227df641f680d844c85ea0ed1694e41ed355e262 (diff) | |
| parent | 901addd4a18a9a166fc3518a7bce70969f884e6f (diff) | |
| download | samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.gz samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.bz2 samba-a999a1fc996234555bd2d8a4a873b39d111c347e.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)
Diffstat (limited to 'source4/ntvfs/common/opendb.h')
| -rw-r--r-- | source4/ntvfs/common/opendb.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h index c34a07d6fa..9591bcf6b9 100644 --- a/source4/ntvfs/common/opendb.h +++ b/source4/ntvfs/common/opendb.h @@ -25,10 +25,11 @@ struct opendb_ops { struct odb_lock *(*odb_lock)(TALLOC_CTX *mem_ctx, struct odb_context *odb, DATA_BLOB *file_key); DATA_BLOB (*odb_get_key)(TALLOC_CTX *mem_ctx, struct odb_lock *lck); - NTSTATUS (*odb_open_file)(struct odb_lock *lck, void *file_handle, - uint32_t stream_id, uint32_t share_access, + NTSTATUS (*odb_open_file)(struct odb_lock *lck, + void *file_handle, const char *path, + uint32_t stream_id, uint32_t share_access, uint32_t access_mask, bool delete_on_close, - const char *path, + uint32_t open_disposition, bool break_to_none, 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); @@ -39,10 +40,12 @@ struct opendb_ops { DATA_BLOB *key, bool *del_on_close, int *open_count, char **path); NTSTATUS (*odb_can_open)(struct odb_lock *lck, - uint32_t share_access, uint32_t create_options, - uint32_t access_mask); + uint32_t stream_id, uint32_t share_access, + uint32_t access_mask, bool delete_on_close, + uint32_t open_disposition, bool break_to_none); NTSTATUS (*odb_update_oplock)(struct odb_lock *lck, void *file_handle, uint32_t oplock_level); + NTSTATUS (*odb_break_oplocks)(struct odb_lock *lck); }; struct opendb_oplock_break { |