From: Volker Lendecke Date: Fri, 11 Jul 2014 11:20:10 +0000 (+0200) Subject: smbd: Rename lck2->rw_probe in brl_conflict_other X-Git-Tag: tdb-1.3.1~659 X-Git-Url: https://repo.or.cz/w/Samba.git/commitdiff_plain/2d8576ea7cdf50c53ea7be68134918aacfbaf5b5 smbd: Rename lck2->rw_probe in brl_conflict_other Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 56c700e5ece..e3f829574a8 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -227,18 +227,18 @@ static bool brl_conflict1(const struct lock_struct *lck1, This is never used in the POSIX lock case. ****************************************************************************/ -static bool brl_conflict_other(const struct lock_struct *lock, const struct lock_struct *lck2) +static bool brl_conflict_other(const struct lock_struct *lock, const struct lock_struct *rw_probe) { - if (IS_PENDING_LOCK(lock->lock_type) || IS_PENDING_LOCK(lck2->lock_type)) + if (IS_PENDING_LOCK(lock->lock_type) || IS_PENDING_LOCK(rw_probe->lock_type)) return False; - if (lock->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) + if (lock->lock_type == READ_LOCK && rw_probe->lock_type == READ_LOCK) return False; /* POSIX flavour locks never conflict here - this is only called in the read/write path. */ - if (lock->lock_flav == POSIX_LOCK && lck2->lock_flav == POSIX_LOCK) + if (lock->lock_flav == POSIX_LOCK && rw_probe->lock_flav == POSIX_LOCK) return False; /* @@ -246,13 +246,13 @@ static bool brl_conflict_other(const struct lock_struct *lock, const struct lock * if the context is the same. JRA. See LOCKTEST7 in smbtorture. */ - if (!(lck2->lock_type == WRITE_LOCK && lock->lock_type == READ_LOCK)) { - if (brl_same_context(&lock->context, &lck2->context) && - lock->fnum == lck2->fnum) + if (!(rw_probe->lock_type == WRITE_LOCK && lock->lock_type == READ_LOCK)) { + if (brl_same_context(&lock->context, &rw_probe->context) && + lock->fnum == rw_probe->fnum) return False; } - return brl_overlap(lock, lck2); + return brl_overlap(lock, rw_probe); } /****************************************************************************