Author: jra Date: 2006-07-09 02:38:21 +0000 (Sun, 09 Jul 2006) New Revision: 16887
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16887 Log: Disable the downcall until I've finished all the logic. Jeremy. Modified: trunk/source/locking/brlock.c trunk/source/locking/posix.c Changeset: Modified: trunk/source/locking/brlock.c =================================================================== --- trunk/source/locking/brlock.c 2006-07-09 01:59:34 UTC (rev 16886) +++ trunk/source/locking/brlock.c 2006-07-09 02:38:21 UTC (rev 16887) @@ -572,7 +572,6 @@ BOOL *my_lock_ctx) { unsigned int i, count; - files_struct *fsp = br_lck->fsp; struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data; struct lock_struct *tp; BOOL lock_was_added = False; @@ -636,7 +635,8 @@ be mapped into a lower level POSIX one, and if so can we get it ? */ - if ((plock->lock_type != PENDING_LOCK) && lp_posix_locking(SNUM(fsp->conn))) { +#if 0 + if ((plock->lock_type != PENDING_LOCK) && lp_posix_locking(SNUM(br_lck->fsp->conn))) { int errno_ret; /* We pass in the entire new lock array to @@ -645,7 +645,7 @@ layer to avoid walking the lock list doing the same split/merge game we've just done. */ - if (!set_posix_lock_posix_flavour(fsp, + if (!set_posix_lock_posix_flavour(br_lck->fsp, plock->start, plock->size, plock->lock_type, @@ -662,6 +662,7 @@ } } } +#endif /* Realloc so we don't leak entries per lock call. */ tp = (struct lock_struct *)SMB_REALLOC(tp, count * sizeof(*locks)); @@ -938,10 +939,12 @@ return True; } +#if 0 /* Unlock any POSIX regions. */ if(lp_posix_locking(br_lck->fsp->conn->cnum)) { release_posix_lock_posix_flavour(br_lck->fsp, plock->start, plock->size, &plock->context); } +#endif /* Realloc so we don't leak entries per unlock call. */ if (count) { Modified: trunk/source/locking/posix.c =================================================================== --- trunk/source/locking/posix.c 2006-07-09 01:59:34 UTC (rev 16886) +++ trunk/source/locking/posix.c 2006-07-09 02:38:21 UTC (rev 16887) @@ -1445,7 +1445,7 @@ by this process as the upper layer would have caught that. We don't need to "stack" the locks or do any split/merge calculations like the Windows flavour of this function does as the upper layer has already done any - lock manipulation neccessary and POSIX locks overwrite, not split. + lock manipulation neccessary and POSIX locks overwrite, not stack. ****************************************************************************/ BOOL set_posix_lock_posix_flavour(files_struct *fsp,
