diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-11 13:19:36 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-22 15:32:39 +0200 |
| commit | e75e4b2ed8eddf43d4752dae2dc571fc02e0137d (patch) | |
| tree | 034e60153ea198c212b783633a971cdca9e9d32c | |
| parent | 432130c57248b7f8085f7978053d1f6cdfb02b4a (diff) | |
| download | samba-e75e4b2ed8eddf43d4752dae2dc571fc02e0137d.tar.gz samba-e75e4b2ed8eddf43d4752dae2dc571fc02e0137d.tar.xz samba-e75e4b2ed8eddf43d4752dae2dc571fc02e0137d.zip | |
smbd: Rename lck1->lock in brl_conflict_other
lck1 and lck2 are treated differently. They should carry more descriptive
names.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -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 51a0fd9357..56c700e5ec 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 *lck1, const struct lock_struct *lck2) +static bool brl_conflict_other(const struct lock_struct *lock, const struct lock_struct *lck2) { - if (IS_PENDING_LOCK(lck1->lock_type) || IS_PENDING_LOCK(lck2->lock_type)) + if (IS_PENDING_LOCK(lock->lock_type) || IS_PENDING_LOCK(lck2->lock_type)) return False; - if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) + if (lock->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) return False; /* POSIX flavour locks never conflict here - this is only called in the read/write path. */ - if (lck1->lock_flav == POSIX_LOCK && lck2->lock_flav == POSIX_LOCK) + if (lock->lock_flav == POSIX_LOCK && lck2->lock_flav == POSIX_LOCK) return False; /* @@ -246,13 +246,13 @@ static bool brl_conflict_other(const struct lock_struct *lck1, const struct lock * if the context is the same. JRA. See LOCKTEST7 in smbtorture. */ - if (!(lck2->lock_type == WRITE_LOCK && lck1->lock_type == READ_LOCK)) { - if (brl_same_context(&lck1->context, &lck2->context) && - lck1->fnum == lck2->fnum) + if (!(lck2->lock_type == WRITE_LOCK && lock->lock_type == READ_LOCK)) { + if (brl_same_context(&lock->context, &lck2->context) && + lock->fnum == lck2->fnum) return False; } - return brl_overlap(lck1, lck2); + return brl_overlap(lock, lck2); } /**************************************************************************** |