mds: refactor if into switch

To make it easier to read and match other constructs in this code.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d74d3aadd08ad37a74bf3a9ade18d0b6670c92a0)

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index aa45c85485963951d58916551466ec8353a456d3..d80458e551d14fb8c89731e27d47d90aa25b0927 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1720,9 +1720,13 @@ bool Locker::rdlock_try_set(MutationImpl::LockOpVec& lov, MutationRef& mut)
 
 void Locker::wrlock_force(SimpleLock *lock, MutationRef& mut)
 {
-  if (lock->get_type() == CEPH_LOCK_IVERSION ||
-      lock->get_type() == CEPH_LOCK_DVERSION)
-    return local_wrlock_grab(static_cast<LocalLockC*>(lock), mut);
+  switch  (lock->get_type()) {
+    case CEPH_LOCK_DVERSION:
+    case CEPH_LOCK_IVERSION:
+      return local_wrlock_grab(static_cast<LocalLockC*>(lock), mut);
+    default:
+      break;
+  }
 
   dout(7) << "wrlock_force  on " << *lock
          << " on " << *lock->get_parent() << dendl;  
@@ -1767,9 +1771,13 @@ bool Locker::wrlock_try(SimpleLock *lock, const MutationRef& mut, client_t clien
 bool Locker::wrlock_start(const MutationImpl::LockOp &op, const MDRequestRef& mut)
 {
   SimpleLock *lock = op.lock;
-  if (lock->get_type() == CEPH_LOCK_IVERSION ||
-      lock->get_type() == CEPH_LOCK_DVERSION)
-    return local_wrlock_start(static_cast<LocalLockC*>(lock), mut);
+  switch  (lock->get_type()) {
+    case CEPH_LOCK_DVERSION:
+    case CEPH_LOCK_IVERSION:
+      return local_wrlock_start(static_cast<LocalLockC*>(lock), mut);
+    default:
+      break;
+  }
 
   dout(10) << "wrlock_start " << *lock << " on " << *lock->get_parent() << dendl;
 
@@ -1828,9 +1836,15 @@ void Locker::wrlock_finish(const MutationImpl::lock_iterator& it, MutationImpl *
   ceph_assert(it->is_wrlock());
   SimpleLock* lock = it->lock;
 
-  if (lock->get_type() == CEPH_LOCK_IVERSION ||
-      lock->get_type() == CEPH_LOCK_DVERSION)
-    return local_wrlock_finish(it, mut);
+  switch  (lock->get_type()) {
+    case CEPH_LOCK_DVERSION:
+    case CEPH_LOCK_IVERSION:
+      return local_wrlock_finish(it, mut);
+    default:
+      break;
+  }
+
+
 
   dout(7) << "wrlock_finish on " << *lock << " on " << *lock->get_parent() << dendl;
   lock->put_wrlock();
@@ -1910,9 +1924,14 @@ void Locker::remote_wrlock_finish(const MutationImpl::lock_iterator& it, Mutatio
 
 bool Locker::xlock_start(SimpleLock *lock, const MDRequestRef& mut)
 {
-  if (lock->get_type() == CEPH_LOCK_IVERSION ||
-      lock->get_type() == CEPH_LOCK_DVERSION)
-    return local_xlock_start(static_cast<LocalLockC*>(lock), mut);
+  switch  (lock->get_type()) {
+    case CEPH_LOCK_DVERSION:
+    case CEPH_LOCK_IVERSION:
+      return local_xlock_start(static_cast<LocalLockC*>(lock), mut);
+    default:
+      break;
+  }
+
 
   dout(7) << "xlock_start on " << *lock << " on " << *lock->get_parent() << dendl;
   client_t client = mut->get_client();
@@ -2031,9 +2050,14 @@ void Locker::xlock_finish(const MutationImpl::lock_iterator& it, MutationImpl *m
   ceph_assert(it->is_xlock());
   SimpleLock *lock = it->lock;
 
-  if (lock->get_type() == CEPH_LOCK_IVERSION ||
-      lock->get_type() == CEPH_LOCK_DVERSION)
-    return local_xlock_finish(it, mut);
+  switch  (lock->get_type()) {
+    case CEPH_LOCK_DVERSION:
+    case CEPH_LOCK_IVERSION:
+      return local_xlock_finish(it, mut);
+    default:
+      break;
+  }
+
 
   dout(10) << "xlock_finish on " << *lock << " " << *lock->get_parent() << dendl;