summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGreg Farnum <gregory.farnum@dreamhost.com>2011-04-06 17:03:12 -0700
committerSage Weil <sage.weil@dreamhost.com>2011-04-16 21:02:56 -0700
commit6250e82c00bef28df699f241b52995c11d350f6e (patch)
treea2209d22692cca877a7b308a13f02dcd33b9f7c2 /src
parent5a65a04a9c18c30ec977c0926d4a3154ee31dbd7 (diff)
downloadceph-6250e82c00bef28df699f241b52995c11d350f6e.tar.gz
mds: adjust LocalLock can_xlock_local().
I don't remember why we needed can_xlock_local() to begin with, but I can tell that adding this get_xlock_by() check won't stop anything working that was ever working to begin with (really it's still not strong enough a check). Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com> Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src')
-rw-r--r--src/mds/LocalLock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/LocalLock.h b/src/mds/LocalLock.h
index 70a54828086..c797ea7d3a2 100644
--- a/src/mds/LocalLock.h
+++ b/src/mds/LocalLock.h
@@ -32,7 +32,7 @@ public:
}
bool can_xlock_local() const {
- return !is_wrlocked();
+ return !is_wrlocked() && (get_xlock_by() == 0);
}
bool can_wrlock() const {