diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 14:11:45 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 14:11:45 +0100 |
commit | 76d6c43ef28ef06d8b2e603da0fa8e5c6faf5fdd (patch) | |
tree | 69042d3212d9046f65fe3123fb0f1b6b46dbfd8b /source4/ntvfs/common/opendb.h | |
parent | 517bf7aa4f77ac0ef421f960f5610b185f6e598e (diff) | |
parent | c3ce0a0b95b6051a356c72424c2d62b77a0e81df (diff) | |
download | samba-76d6c43ef28ef06d8b2e603da0fa8e5c6faf5fdd.tar.gz samba-76d6c43ef28ef06d8b2e603da0fa8e5c6faf5fdd.tar.bz2 samba-76d6c43ef28ef06d8b2e603da0fa8e5c6faf5fdd.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 84b677285250d9b9a1120fcfd6e4bbbb8f939fe8)
Diffstat (limited to 'source4/ntvfs/common/opendb.h')
-rw-r--r-- | source4/ntvfs/common/opendb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h index 9591bcf6b9..33f2e1c88d 100644 --- a/source4/ntvfs/common/opendb.h +++ b/source4/ntvfs/common/opendb.h @@ -32,13 +32,13 @@ struct opendb_ops { 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); + NTSTATUS (*odb_close_file)(struct odb_lock *lck, void *file_handle, + const char **delete_path); NTSTATUS (*odb_remove_pending)(struct odb_lock *lck, void *private); NTSTATUS (*odb_rename)(struct odb_lock *lck, const char *path); NTSTATUS (*odb_set_delete_on_close)(struct odb_lock *lck, bool del_on_close); NTSTATUS (*odb_get_delete_on_close)(struct odb_context *odb, - DATA_BLOB *key, bool *del_on_close, - int *open_count, char **path); + DATA_BLOB *key, bool *del_on_close); NTSTATUS (*odb_can_open)(struct odb_lock *lck, uint32_t stream_id, uint32_t share_access, uint32_t access_mask, bool delete_on_close, |