From 96c08e4fc3207a952d15720d8c100242cd7fe601 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 22 Sep 2010 11:14:08 -0700 Subject: [PATCH] mds: Make SimpleLock wait shift bits unique like they should be. This wasn't actually breaking stuff before, but it did mean we woke up stuff we didn't need to. --- src/mds/SimpleLock.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h index 674befffed696..2e06b279d7331 100644 --- a/src/mds/SimpleLock.h +++ b/src/mds/SimpleLock.h @@ -228,16 +228,16 @@ public: int get_wait_shift() { switch (get_type()) { case CEPH_LOCK_DN: return 8; - case CEPH_LOCK_DVERSION: return 8 + SimpleLock::WAIT_BITS; - case CEPH_LOCK_IAUTH: return 8 + 1*SimpleLock::WAIT_BITS; - case CEPH_LOCK_ILINK: return 8 + 2*SimpleLock::WAIT_BITS; - case CEPH_LOCK_IDFT: return 8 + 3*SimpleLock::WAIT_BITS; - case CEPH_LOCK_IFILE: return 8 + 4*SimpleLock::WAIT_BITS; - case CEPH_LOCK_IVERSION: return 8 + 5*SimpleLock::WAIT_BITS; - case CEPH_LOCK_IXATTR: return 8 + 6*SimpleLock::WAIT_BITS; - case CEPH_LOCK_ISNAP: return 8 + 7*SimpleLock::WAIT_BITS; - case CEPH_LOCK_INEST: return 8 + 8*SimpleLock::WAIT_BITS; - case CEPH_LOCK_IFLOCK: return 8 + 9*SimpleLock::WAIT_BITS; + case CEPH_LOCK_DVERSION: return 8 + 1*SimpleLock::WAIT_BITS; + case CEPH_LOCK_IAUTH: return 8 + 2*SimpleLock::WAIT_BITS; + case CEPH_LOCK_ILINK: return 8 + 3*SimpleLock::WAIT_BITS; + case CEPH_LOCK_IDFT: return 8 + 4*SimpleLock::WAIT_BITS; + case CEPH_LOCK_IFILE: return 8 + 5*SimpleLock::WAIT_BITS; + case CEPH_LOCK_IVERSION: return 8 + 6*SimpleLock::WAIT_BITS; + case CEPH_LOCK_IXATTR: return 8 + 7*SimpleLock::WAIT_BITS; + case CEPH_LOCK_ISNAP: return 8 + 8*SimpleLock::WAIT_BITS; + case CEPH_LOCK_INEST: return 8 + 9*SimpleLock::WAIT_BITS; + case CEPH_LOCK_IFLOCK: return 8 +10*SimpleLock::WAIT_BITS; default: assert(0); } -- 2.39.5