diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-02-25 17:48:13 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-02-26 09:32:56 +0100 |
| commit | 7264a8b7ca5f91120dbc30fcbe8e8402f09ae883 (patch) | |
| tree | 329fcc47adcc0e15dc801b3c594265cc890a5632 /source4/cluster/ctdb | |
| parent | 9852e0d31582f669179c2a8c8ebdb263fef611f2 (diff) | |
| download | samba-7264a8b7ca5f91120dbc30fcbe8e8402f09ae883.tar.gz samba-7264a8b7ca5f91120dbc30fcbe8e8402f09ae883.tar.bz2 samba-7264a8b7ca5f91120dbc30fcbe8e8402f09ae883.zip | |
opendb: unify the parameters of odb_open_file() and odb_can_open()
metze
(This used to be commit e6b708a52b0eada3fd374b66292ded3b0f6ce217)
Diffstat (limited to 'source4/cluster/ctdb')
| -rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index 36ae204974..3dfc6819b7 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -596,8 +596,9 @@ static NTSTATUS odb_ctdb_get_delete_on_close(struct odb_context *odb, create_options and access_mask */ static NTSTATUS odb_ctdb_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) { struct odb_context *odb = lck->odb; NTSTATUS status; @@ -611,7 +612,7 @@ static NTSTATUS odb_ctdb_can_open(struct odb_lock *lck, } NT_STATUS_NOT_OK_RETURN(status); - if ((create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) && + if (delete_on_close && file.num_entries != 0) { return NT_STATUS_SHARING_VIOLATION; } |