mds: cleanup

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index dc7bd2aa3b3fefecbdf0df776fcaed195d946e8e..f6f10d2f48d3b0e7a1ffeb2b2f6ccb94bc61f7b5 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2558,16 +2558,20 @@ void Server::handle_client_file_setlock(MDRequest *mdr)
 {
   MClientRequest *req = mdr->client_request;
   set<SimpleLock*> rdlocks, wrlocks, xlocks;
-  //get the inode to operate on, and set up any locks needed for that
+
+  // get the inode to operate on, and set up any locks needed for that
   CInode *cur = rdlock_path_pin_ref(mdr, 0, rdlocks, true);
-  if (!cur) return;
-  wrlocks.insert(&cur->flocklock);
+  if (!cur)
+    return;
+
+  xlocks.insert(&cur->flocklock);
   /* acquire_locks will return true if it gets the locks. If it fails,
      it will redeliver this request at a later date, so drop the request.
    */
-  if (!mds->locker->acquire_locks(mdr, rdlocks, wrlocks, xlocks)) return;
+  if (!mds->locker->acquire_locks(mdr, rdlocks, wrlocks, xlocks))
+    return;
 
-  //copy the lock change into a ceph_filelock so we can store/apply it
+  // copy the lock change into a ceph_filelock so we can store/apply it
   ceph_filelock set_lock;
   set_lock.start = req->head.args.filelock_change.start;
   set_lock.length = req->head.args.filelock_change.length;
@@ -2577,8 +2581,9 @@ void Server::handle_client_file_setlock(MDRequest *mdr)
   bool will_wait = req->head.args.filelock_change.wait;
 
   ceph_lock_state_t *lock_state = NULL;
-  //get the appropriate lock state
-  switch(req->head.args.filelock_change.rule) {
+
+  // get the appropriate lock state
+  switch (req->head.args.filelock_change.rule) {
   case CEPH_LOCK_FLOCK:
     lock_state = &cur->flock_locks;
     break;
@@ -2601,13 +2606,15 @@ void Server::handle_client_file_setlock(MDRequest *mdr)
      * will be sent when the lock comes up again in rotation by the MDS.
      * It's a cheap hack, but it's easy to code. */
   } else {
-    if (lock_state->add_lock(set_lock, will_wait)) { //lock set successfully
+    if (lock_state->add_lock(set_lock, will_wait)) {
+      // lock set successfully
       reply_request(mdr, 0);
-    } else { //couldn't set lock right now
-      if (!will_wait) reply_request(mdr, -1);
-      else {
+    } else {
+      // couldn't set lock right now
+      if (!will_wait)
+       reply_request(mdr, -1);
+      else
        cur->add_waiter(CInode::WAIT_FLOCK, new C_MDS_RetryRequest(mdcache, mdr));
-      }
     }
   }
 }
@@ -2616,15 +2623,20 @@ void Server::handle_client_file_readlock(MDRequest *mdr)
 {
   MClientRequest *req = mdr->client_request;
   set<SimpleLock*> rdlocks, wrlocks, xlocks;
-  //get the inode to operate on, and set up any locks needed for that
+
+  // get the inode to operate on, and set up any locks needed for that
   CInode *cur = rdlock_path_pin_ref(mdr, 0, rdlocks, true);
-  if (!cur) return;
+  if (!cur)
+    return;
+
   /* acquire_locks will return true if it gets the locks. If it fails,
      it will redeliver this request at a later date, so drop the request.
   */
-  if (!mds->locker->acquire_locks(mdr, rdlocks, wrlocks, xlocks)) return;
+  rdlocks.insert(&cur->flocklock);
+  if (!mds->locker->acquire_locks(mdr, rdlocks, wrlocks, xlocks))
+    return;
   
-  //copy the lock change into a ceph_filelock so we can store/apply it
+  // copy the lock change into a ceph_filelock so we can store/apply it
   ceph_filelock checking_lock;
   checking_lock.start = req->head.args.filelock_change.start;
   checking_lock.length = req->head.args.filelock_change.length;
@@ -2632,9 +2644,9 @@ void Server::handle_client_file_readlock(MDRequest *mdr)
   checking_lock.pid = req->head.args.filelock_change.pid;
   checking_lock.type = req->head.args.filelock_change.type;
 
+  // get the appropriate lock state
   ceph_lock_state_t *lock_state = NULL;
-  //get the appropriate lock state
-  switch(req->head.args.filelock_change.rule) {
+  switch (req->head.args.filelock_change.rule) {
   case CEPH_LOCK_FLOCK:
     lock_state = &cur->flock_locks;
     break;

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 0a4aafabcb41c923a1b3f7b3dd447723cbb50cb5..8f29b1c559666a9e5e7a898ce8e37fd24874c758 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -334,10 +334,11 @@ inline bool operator==(const byte_range_t& l, const byte_range_t& r) {
   return l.first == r.first && l.last == r.last;
 }
 
+
 struct ceph_lock_state_t {
-  multimap<__u64, ceph_filelock> held_locks; //current locks
-  multimap<__u64, ceph_filelock> waiting_locks; //locks waiting for other locks
-  //both of the above are keyed by starting offset
+  multimap<__u64, ceph_filelock> held_locks;    // current locks
+  multimap<__u64, ceph_filelock> waiting_locks; // locks waiting for other locks
+  // both of the above are keyed by starting offset
 
   /*
    * Try to set a new lock. If it's blocked and wait_on_fail is true,
@@ -348,7 +349,7 @@ struct ceph_lock_state_t {
    */
   bool add_lock(ceph_filelock& new_lock, bool wait_on_fail) {
     list<ceph_filelock*> overlapping_locks, self_overlapping_locks;
-    //first, get any overlapping locks and split them into owned-by-us and not
+    // first, get any overlapping locks and split them into owned-by-us and not
     if(get_overlapping_locks(new_lock, overlapping_locks)) {
       split_by_owner(new_lock, overlapping_locks, self_overlapping_locks);
     }