svn commit: samba r1978 - branches/SAMBA_3_0/source/smbd
jra at samba.org
jra at samba.org
Fri Aug 20 23:46:18 GMT 2004
Author: jra
Date: 2004-08-20 23:46:18 +0000 (Fri, 20 Aug 2004)
New Revision: 1978
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1978&nolog=1
Log:
Roll it back until I do it right.... :-).
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/blocking.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/blocking.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/blocking.c 2004-08-20 23:39:40 UTC (rev 1977)
+++ branches/SAMBA_3_0/source/smbd/blocking.c 2004-08-20 23:46:18 UTC (rev 1978)
@@ -27,9 +27,8 @@
notify. It consists of the requesting SMB and the expiry time.
*****************************************************************************/
-typedef struct _blocking_lock_record {
- struct _blocking_lock_record *next;
- struct _blocking_lock_record *prev;
+typedef struct {
+ ubi_slNode msg_next;
int com_type;
files_struct *fsp;
time_t expire_time;
@@ -41,7 +40,7 @@
int length;
} blocking_lock_record;
-static blocking_lock_record *blocking_lock_queue;
+static ubi_slList blocking_lock_queue = { NULL, (ubi_slNodePtr)&blocking_lock_queue, 0};
/****************************************************************************
Destructor for the above structure.
@@ -91,7 +90,7 @@
int lock_num, uint16 lock_pid, SMB_BIG_UINT offset, SMB_BIG_UINT count)
{
static BOOL set_lock_msg;
- blocking_lock_record *blr, *tmp;
+ blocking_lock_record *blr;
BOOL my_lock_ctx = False;
NTSTATUS status;
@@ -137,7 +136,7 @@
return False;
}
- DLIST_ADD_END(blocking_lock_queue, blr, tmp);
+ ubi_slAddTail(&blocking_lock_queue, blr);
/* Ensure we'll receive messages when this is unlocked. */
if (!set_lock_msg) {
@@ -517,10 +516,10 @@
void remove_pending_lock_requests_by_fid(files_struct *fsp)
{
- blocking_lock_record *blr, *next = NULL;
+ blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
+ blocking_lock_record *prev = NULL;
- for(blr = blocking_lock_queue; blr; blr = next) {
- next = blr->next;
+ while(blr != NULL) {
if(blr->fsp->fnum == fsp->fnum) {
DEBUG(10,("remove_pending_lock_requests_by_fid - removing request type %d for \
@@ -530,8 +529,13 @@
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
blr->offset, blr->count, True, NULL, NULL);
- free_blocking_lock_record(blr);
+ free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
+ blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
+ continue;
}
+
+ prev = blr;
+ blr = (blocking_lock_record *)ubi_slNext(blr);
}
}
@@ -541,10 +545,10 @@
void remove_pending_lock_requests_by_mid(int mid)
{
- blocking_lock_record *blr, *next = NULL;
+ blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
+ blocking_lock_record *prev = NULL;
- for(blr = blocking_lock_queue; blr; blr = next) {
- next = blr->next;
+ while(blr != NULL) {
if(SVAL(blr->inbuf,smb_mid) == mid) {
files_struct *fsp = blr->fsp;
@@ -555,8 +559,13 @@
brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
blr->offset, blr->count, True, NULL, NULL);
- free_blocking_lock_record(blr);
+ free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
+ blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
+ continue;
}
+
+ prev = blr;
+ blr = (blocking_lock_record *)ubi_slNext(blr);
}
}
@@ -578,7 +587,7 @@
{
unsigned timeout = default_timeout;
time_t t;
- blocking_lock_record *blr = blocking_lock_queue;
+ blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst(&blocking_lock_queue);
/* note that we avoid the time() syscall if there are no blocking locks */
if (!blr)
@@ -586,11 +595,12 @@
t = time(NULL);
- for (; blr; blr = blr->next) {
+ while (blr) {
if ((blr->expire_time != (time_t)-1) &&
(timeout > (blr->expire_time - t))) {
timeout = blr->expire_time - t;
}
+ blr = (blocking_lock_record *)ubi_slNext(blr);
}
if (timeout < 1)
@@ -605,19 +615,21 @@
void process_blocking_lock_queue(time_t t)
{
- blocking_lock_record *blr, *next = NULL;
+ blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
+ blocking_lock_record *prev = NULL;
+ if(blr == NULL)
+ return;
+
/*
* Go through the queue and see if we can get any of the locks.
*/
- for (blr = blocking_lock_queue; blr; blr = next) {
+ while(blr != NULL) {
connection_struct *conn = NULL;
uint16 vuid;
files_struct *fsp = NULL;
- next = blr->next;
-
/*
* Ensure we don't have any old chain_fsp values
* sitting around....
@@ -646,7 +658,8 @@
blr->offset, blr->count, True, NULL, NULL);
blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
- free_blocking_lock_record(blr);
+ free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
+ blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
continue;
}
@@ -662,7 +675,8 @@
blr->lock_pid, sys_getpid(), conn->cnum,
blr->offset, blr->count, True, NULL, NULL);
- free_blocking_lock_record(blr);
+ free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
+ blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
continue;
}
@@ -677,7 +691,8 @@
blr->lock_pid, sys_getpid(), conn->cnum,
blr->offset, blr->count, True, NULL, NULL);
- free_blocking_lock_record(blr);
+ free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
+ blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
change_to_root_user();
continue;
}
@@ -694,8 +709,18 @@
blr->lock_pid, sys_getpid(), conn->cnum,
blr->offset, blr->count, True, NULL, NULL);
- free_blocking_lock_record(blr);
+ free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
+ blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
+ change_to_root_user();
+ continue;
}
+
change_to_root_user();
+
+ /*
+ * Move to the next in the list.
+ */
+ prev = blr;
+ blr = (blocking_lock_record *)ubi_slNext(blr);
}
}
More information about the samba-cvs
mailing list