Merge remote-tracking branch 'origin/wip-client-fsync'

Conflicts:
	src/client/Client.cc

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/client/Client.cc
index ea50991971e7677150630e9109de4e277e0a2bc9,7016c0fd51848b955f750047f596cf57a29cc9ba..a027528eb7cd8ea490f7d682cb95aa3ba171bc9c
--- 1/src/client/Client.cc
--- 2/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -2112,9 -2111,12 +2128,11 @@@ void Client::handle_client_reply(MClien
      // we're done, clean up
      if (request->got_unsafe) {
        request->unsafe_item.remove_myself();
+       request->unsafe_dir_item.remove_myself();
+       signal_cond_list(request->waitfor_safe);
      }
      request->item.remove_myself();
 -    mds_requests.erase(tid);
 -    put_request(request);
 +    unregister_request(request);
    }
    if (unmounting)
      mount_cond.Signal();
@@@ -2484,7 -2486,10 +2502,9 @@@ void Client::kick_requests_closed(MetaS
        if (req->got_unsafe) {
        lderr(cct) << "kick_requests_closed removing unsafe request " << req->get_tid() << dendl;
        req->unsafe_item.remove_myself();
 -      mds_requests.erase(req->get_tid());
 -      put_request(req);
+       req->unsafe_dir_item.remove_myself();
+       signal_cond_list(req->waitfor_safe);
 +      unregister_request(req);
        }
      }
    }

diff --cc src/client/Client.h
Simple merge