sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

Two fixes. Added missong logic & case in lock split code.

Browse Source 
Fixed range split into two, as DLIST_ADD has the wrong semantics...
Jeremy.
(This used to be commit 82681edda1)
This commit is contained in:
Jeremy Allison
2000-05-05 02:17:39 +00:00
parent 044b569006
commit 091c970682
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source3/locking/posix.c
View File

@ -1113,7 +1113,8 @@ BECOMES....
ul_curr = ul_curr->next; ul_curr = ul_curr->next;
} else if ( (ul_curr->start < lock->start) && } else if ( (ul_curr->start < lock->start) &&
(ul_curr->start + ul_curr->size > lock->start) ) { (ul_curr->start + ul_curr->size > lock->start) &&
(ul_curr->start + ul_curr->size <= lock->start + lock->size) ) {
/* /*
* This unlock overlaps the existing lock range at the low end. * This unlock overlaps the existing lock range at the low end.
@ -1171,9 +1172,6 @@ BECOMES.....
ul_new->start = lock->start + lock->size; ul_new->start = lock->start + lock->size;
ul_new->size = ul_curr->start + ul_curr->size - ul_new->start; ul_new->size = ul_curr->start + ul_curr->size - ul_new->start;
/* Add into the dlink list after the ul_curr point - NOT at ulhead. */
DLIST_ADD(ul_curr, ul_new);
/* Truncate the ul_curr. */ /* Truncate the ul_curr. */
ul_curr->size = lock->start - ul_curr->start; ul_curr->size = lock->start - ul_curr->start;
@ -1181,6 +1179,16 @@ BECOMES.....
new: start=%.0f,size=%.0f\n", (double)ul_curr->start, (double)ul_curr->size, new: start=%.0f,size=%.0f\n", (double)ul_curr->start, (double)ul_curr->size,
(double)ul_new->start, (double)ul_new->size )); (double)ul_new->start, (double)ul_new->size ));
/*
* Add into the dlink list after the ul_curr point - NOT at ulhead.
* Note we can't use DLINK_ADD here as this inserts at the head of the given list.
*/
ul_new->prev = ul_curr;
ul_new->next = ul_curr->next;
ul_curr->next = ul_new;
/* And move after the link we added. */
ul_curr = ul_new->next; ul_curr = ul_new->next;
} else { } else {