diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-13 10:00:57 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-13 10:00:57 +1100 |
| commit | 3d9056aa863c8e1307709bcbbdbd3305e9bfe62f (patch) | |
| tree | 49224fa1f8e5bc488e01f709015ed37be9b9d898 /source4/cluster/ctdb/opendb_ctdb.c | |
| parent | 07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01 (diff) | |
| parent | 50243cdbbda8a1f14e56c684281a93614aab0103 (diff) | |
| download | samba-3d9056aa863c8e1307709bcbbdbd3305e9bfe62f.tar.gz samba-3d9056aa863c8e1307709bcbbdbd3305e9bfe62f.tar.bz2 samba-3d9056aa863c8e1307709bcbbdbd3305e9bfe62f.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit e9567e39106efb7443ed2c5df3492208b1c1d766)
Diffstat (limited to 'source4/cluster/ctdb/opendb_ctdb.c')
| -rw-r--r-- | source4/cluster/ctdb/opendb_ctdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c index a7b8ddf760..402f3a2a1a 100644 --- a/source4/cluster/ctdb/opendb_ctdb.c +++ b/source4/cluster/ctdb/opendb_ctdb.c @@ -283,7 +283,7 @@ static NTSTATUS odb_oplock_break_send(struct odb_context *odb, struct opendb_ent */ static NTSTATUS odb_ctdb_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) { |