diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-03-07 10:33:57 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-03-07 19:15:21 +0100 |
| commit | 6c27daeeca9c2649896b70fba78c3c401159defe (patch) | |
| tree | 4e7e0cbf76d9300f9db37fc4d8607d6c3314614d | |
| parent | b655468cf6646bdcc6bb78fe87492cf34b54713f (diff) | |
| download | samba-6c27daeeca9c2649896b70fba78c3c401159defe.tar.gz samba-6c27daeeca9c2649896b70fba78c3c401159defe.tar.bz2 samba-6c27daeeca9c2649896b70fba78c3c401159defe.zip | |
opendb_tdb: pass down struct messaging_context directly to odb_oplock_break_send()
metze
(This used to be commit c993b07f7d5caf290ccb9ca81961aa35a3ed1f02)
| -rw-r--r-- | source4/ntvfs/common/opendb_tdb.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index 0736af3d1e..75424e65f6 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -263,7 +263,7 @@ static NTSTATUS odb_push_record(struct odb_lock *lck, struct opendb_file *file) /* send an oplock break to a client */ -static NTSTATUS odb_oplock_break_send(struct odb_context *odb, +static NTSTATUS odb_oplock_break_send(struct messaging_context *msg_ctx, struct opendb_entry *e, uint8_t level) { @@ -280,7 +280,7 @@ static NTSTATUS odb_oplock_break_send(struct odb_context *odb, blob = data_blob_const(&op_break, sizeof(op_break)); - status = messaging_send(odb->ntvfs_ctx->msg_ctx, e->server, + status = messaging_send(msg_ctx, e->server, MSG_NTVFS_OPLOCK_BREAK, &blob); NT_STATUS_NOT_OK_RETURN(status); @@ -348,7 +348,8 @@ static NTSTATUS odb_tdb_open_can_internal(struct odb_context *odb, !file->entries[i].allow_level_II_oplock) { oplock_return = OPLOCK_BREAK_TO_NONE; } - odb_oplock_break_send(odb, &file->entries[i], + odb_oplock_break_send(odb->ntvfs_ctx->msg_ctx, + &file->entries[i], oplock_return); return NT_STATUS_OPLOCK_NOT_GRANTED; } @@ -396,7 +397,8 @@ static NTSTATUS odb_tdb_open_can_internal(struct odb_context *odb, !file->entries[i].allow_level_II_oplock) { oplock_return = OPLOCK_BREAK_TO_NONE; } - odb_oplock_break_send(odb, &file->entries[i], + odb_oplock_break_send(odb->ntvfs_ctx->msg_ctx, + &file->entries[i], oplock_return); return NT_STATUS_OPLOCK_NOT_GRANTED; } @@ -655,7 +657,8 @@ static NTSTATUS odb_tdb_break_oplocks(struct odb_lock *lck) * and we just send a break to none to all of them * without waiting for a release */ - odb_oplock_break_send(odb, &file.entries[i], + odb_oplock_break_send(odb->ntvfs_ctx->msg_ctx, + &file.entries[i], OPLOCK_BREAK_TO_NONE); file.entries[i].oplock_level = OPLOCK_NONE; modified = true; |