sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

opendb_tdb: pass down struct messaging_context directly to odb_oplock_break_send()

Browse Source 
metze
(This used to be commit c993b07f7d)
This commit is contained in:
Stefan Metzmacher 2008-03-07 10:33:57 +01:00
parent b655468cf6
commit 6c27daeeca
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source4/ntvfs/common/opendb_tdb.c
View File

@ -263,7 +263,7 @@ static NTSTATUS odb_push_record(struct odb_lock *lck, struct opendb_file *file)
/* /*
send an oplock break to a client 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, struct opendb_entry *e,
uint8_t level) 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)); 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); MSG_NTVFS_OPLOCK_BREAK, &blob);
NT_STATUS_NOT_OK_RETURN(status); 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) { !file->entries[i].allow_level_II_oplock) {
oplock_return = OPLOCK_BREAK_TO_NONE; 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); oplock_return);
return NT_STATUS_OPLOCK_NOT_GRANTED; 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) { !file->entries[i].allow_level_II_oplock) {
oplock_return = OPLOCK_BREAK_TO_NONE; 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); oplock_return);
return NT_STATUS_OPLOCK_NOT_GRANTED; 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 * and we just send a break to none to all of them
* without waiting for a release * 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); OPLOCK_BREAK_TO_NONE);
file.entries[i].oplock_level = OPLOCK_NONE; file.entries[i].oplock_level = OPLOCK_NONE;
modified = true; modified = true;