Author: jra Date: 2006-04-10 23:29:47 +0000 (Mon, 10 Apr 2006) New Revision: 15026
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15026 Log: Fix warning until POSIX locking finished. Jeremy. Modified: branches/SAMBA_3_0/source/locking/brlock.c Changeset: Modified: branches/SAMBA_3_0/source/locking/brlock.c =================================================================== --- branches/SAMBA_3_0/source/locking/brlock.c 2006-04-10 22:57:12 UTC (rev 15025) +++ branches/SAMBA_3_0/source/locking/brlock.c 2006-04-10 23:29:47 UTC (rev 15026) @@ -601,7 +601,6 @@ unsigned int i, count; struct lock_struct *locks = (struct lock_struct *)br_lck->lock_data; struct lock_struct *tp; - files_struct *fsp = br_lck->fsp; BOOL lock_was_added = False; /* No zero-zero locks for POSIX. */ @@ -664,8 +663,8 @@ /* FIXME - this call doesn't work correctly yet for POSIX locks... */ if ((plock->lock_type != PENDING_LOCK) && lp_posix_locking(SNUM(fsp->conn))) { + files_struct *fsp = br_lck->fsp; - if (!set_posix_lock(fsp, plock->start, plock->size, plock->lock_type, POSIX_LOCK)) { if (errno == EACCES || errno == EAGAIN) { SAFE_FREE(tp);
