diff options
| author | Sage Weil <sage@newdream.net> | 2010-09-07 14:38:48 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-09-07 14:38:48 -0700 |
| commit | b7b77ffc1718ea1743e199745e2c55f99ddaa16a (patch) | |
| tree | 10ace91b2ec243358573e49863c297b99f9df18d /src/mds/SimpleLock.h | |
| parent | 2c47edc3ebedf5ce20bc5df5c4d7ddf4ed2a6d91 (diff) | |
| download | ceph-b7b77ffc1718ea1743e199745e2c55f99ddaa16a.tar.gz | |
Revert "Merge branch 'auth_change_waiters' into unstable"
This reverts commit 1d8770be2747c43a1aef05a6439b7e23a87f0419, reversing
changes made to 46bf806a774a3cd28b3a1da4ec79fb9e61124ba8.
Diffstat (limited to 'src/mds/SimpleLock.h')
| -rw-r--r-- | src/mds/SimpleLock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h index 554eaff0bc1..674befffed6 100644 --- a/src/mds/SimpleLock.h +++ b/src/mds/SimpleLock.h @@ -288,8 +288,7 @@ public: parent->take_waiting(mask << get_wait_shift(), ls); } void add_waiter(uint64_t mask, Context *c) { - // preserve WAIT_AUTHCHANGE bit unshifted, if present. - parent->add_waiter((mask << get_wait_shift()) | (mask & MDSCacheObject::WAIT_AUTHCHANGE), c); + parent->add_waiter(mask << get_wait_shift(), c); } bool is_waiter_for(uint64_t mask) { return parent->is_waiter_for(mask << get_wait_shift()); |