diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-11 13:20:10 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-22 15:32:39 +0200 |
| commit | 2d8576ea7cdf50c53ea7be68134918aacfbaf5b5 (patch) | |
| tree | e919a09040a309b1cd324c918d284d82e3dc88d3 /source3/locking | |
| parent | e75e4b2ed8eddf43d4752dae2dc571fc02e0137d (diff) | |
| download | samba-2d8576ea7cdf50c53ea7be68134918aacfbaf5b5.tar.gz | |
smbd: Rename lck2->rw_probe in brl_conflict_other
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); } /**************************************************************************** |