From a902349e5ca254c2ca35cc8415f037505311006c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 19 Dec 2008 13:01:29 -0800
Subject: [PATCH] mds: filelock typo in can_rdlock

---
 src/mds/FileLock.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mds/FileLock.h b/src/mds/FileLock.h
index 3da9783fadcb1..25462ce29c62f 100644
--- a/src/mds/FileLock.h
+++ b/src/mds/FileLock.h
@@ -144,12 +144,13 @@ class FileLock : public ScatterLock {
 
   // read/write access
   bool can_rdlock() {
-    if (!parent->is_auth()) {
-      if (state == LOCK_LOCK && !xlock_by)
-	return true;
-      return (state == LOCK_SYNC);
-    } else
-      return (state == LOCK_SYNC);
+    if (parent->is_auth())
+      return
+	(state == LOCK_LOCK && !xlock_by) ||
+	(state == LOCK_SYNC);
+    else
+      return
+	(state == LOCK_SYNC);
   }
   bool can_rdlock_soon() {
     if (parent->is_auth())
-- 
2.39.5