summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-06 16:15:45 +0100
committerVolker Lendecke <vl@samba.org>2008-01-10 13:19:58 +0100
commit5ddb2abf7611a93960056075ea56f992329c3678 (patch)
treea1f088bee5f3ecaf3dd979b54bd587193460ae2c /source3/smbd
parent3cc3b9e1879d3d9714ac2914364418a140e8389c (diff)
downloadsamba-5ddb2abf7611a93960056075ea56f992329c3678.tar.gz
samba-5ddb2abf7611a93960056075ea56f992329c3678.tar.bz2
samba-5ddb2abf7611a93960056075ea56f992329c3678.zip
Some more talloc_tos()
(This used to be commit 444e35e7df1f13fc285183da8fb41b30ad99a3fa)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 4e0d5289f8..479361a8c1 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -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