sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

Some more talloc_tos()

Browse Source 
(This used to be commit 444e35e7df1f13fc285183da8fb41b30ad99a3fa)
This commit is contained in:
Volker Lendecke 2008-01-06 16:15:45 +01:00
parent 3cc3b9e187
commit 5ddb2abf76
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/locking/locking.c
View File

@ -102,7 +102,7 @@ bool is_locked(files_struct *fsp,
DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp->fsp_name ));
ret = False;
} else {
struct byte_range_lock *br_lck = brl_get_locks_readonly(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks_readonly(talloc_tos(), fsp);
if (!br_lck) {
return False;
}
@ -116,7 +116,7 @@ bool is_locked(files_struct *fsp,
TALLOC_FREE(br_lck);
}
} else {
struct byte_range_lock *br_lck = brl_get_locks_readonly(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks_readonly(talloc_tos(), fsp);
if (!br_lck) {
return False;
}
@ -160,7 +160,7 @@ NTSTATUS query_lock(files_struct *fsp,
return NT_STATUS_OK;
}
br_lck = brl_get_locks_readonly(NULL, fsp);
br_lck = brl_get_locks_readonly(talloc_tos(), fsp);
if (!br_lck) {
return NT_STATUS_NO_MEMORY;
}
@ -210,7 +210,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
lock_flav_name(lock_flav), lock_type_name(lock_type),
(double)offset, (double)count, fsp->fnum, fsp->fsp_name ));
br_lck = brl_get_locks(NULL, fsp);
br_lck = brl_get_locks(talloc_tos(), fsp);
if (!br_lck) {
*perr = NT_STATUS_NO_MEMORY;
return NULL;
@ -269,7 +269,7 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
DEBUG(10,("do_unlock: unlock start=%.0f len=%.0f requested for fnum %d file %s\n",
(double)offset, (double)count, fsp->fnum, fsp->fsp_name ));
br_lck = brl_get_locks(NULL, fsp);
br_lck = brl_get_locks(talloc_tos(), fsp);
if (!br_lck) {
return NT_STATUS_NO_MEMORY;
}
@ -323,7 +323,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
DEBUG(10,("do_lock_cancel: cancel start=%.0f len=%.0f requested for fnum %d file %s\n",
(double)offset, (double)count, fsp->fnum, fsp->fsp_name ));
br_lck = brl_get_locks(NULL, fsp);
br_lck = brl_get_locks(talloc_tos(), fsp);
if (!br_lck) {
return NT_STATUS_NO_MEMORY;
}
@ -372,7 +372,7 @@ void locking_close_file(struct messaging_context *msg_ctx,
return;
}
br_lck = brl_get_locks(NULL,fsp);
br_lck = brl_get_locks(talloc_tos(),fsp);
if (br_lck) {
cancel_pending_lock_requests_by_fid(fsp, br_lck);

2
source3/rpc_server/srv_srvsvc_nt.c
View File

@ -167,7 +167,7 @@ static void enum_file_fn( const struct share_mode_entry *e,
ZERO_STRUCT( fsp );
fsp.file_id = e->id;
if ( (brl = brl_get_locks(NULL,&fsp)) != NULL ) {
if ( (brl = brl_get_locks(talloc_tos(), &fsp)) != NULL ) {
num_locks = brl->num_locks;
TALLOC_FREE(brl);
}

10
source3/smbd/blocking.c
View File

@ -625,7 +625,7 @@ void remove_pending_lock_requests_by_mid(int mid)
next = blr->next;
if(SVAL(blr->inbuf,smb_mid) == mid) {
files_struct *fsp = blr->fsp;
struct byte_range_lock *br_lck = brl_get_locks(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks(talloc_tos(), fsp);
if (br_lck) {
DEBUG(10,("remove_pending_lock_requests_by_mid - removing request type %d for \
@ -715,7 +715,7 @@ static void process_blocking_lock_queue(void)
fsp->fnum, fsp->fsp_name ));
if(!change_to_user(conn,vuid)) {
struct byte_range_lock *br_lck = brl_get_locks(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks(talloc_tos(), fsp);
/*
* Remove the entry and return an error to the client.
@ -741,7 +741,7 @@ static void process_blocking_lock_queue(void)
}
if(!set_current_service(conn,SVAL(blr->inbuf,smb_flg),True)) {
struct byte_range_lock *br_lck = brl_get_locks(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks(talloc_tos(), fsp);
/*
* Remove the entry and return an error to the client.
@ -773,7 +773,7 @@ static void process_blocking_lock_queue(void)
*/
if(blocking_lock_record_process(blr)) {
struct byte_range_lock *br_lck = brl_get_locks(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks(talloc_tos(), fsp);
if (br_lck) {
brl_lock_cancel(br_lck,
@ -800,7 +800,7 @@ static void process_blocking_lock_queue(void)
*/
if (!timeval_is_zero(&blr->expire_time) && timeval_compare(&blr->expire_time, &tv_curr) <= 0) {
struct byte_range_lock *br_lck = brl_get_locks(NULL, fsp);
struct byte_range_lock *br_lck = brl_get_locks(talloc_tos(), fsp);
/*
* Lock expired - throw away all previously