From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 5 Jun 2015 18:25:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-client-fsync'
X-Git-Tag: v9.0.2~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=905a867043d1989149065f2f26a009d25448d307;p=ceph.git

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

Conflicts:
	src/client/Client.cc

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

905a867043d1989149065f2f26a009d25448d307
diff --cc src/client/Client.cc
index ea50991971e,7016c0fd518..a027528eb7c
--- a/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();
+ 	req->unsafe_dir_item.remove_myself();
+ 	signal_cond_list(req->waitfor_safe);
 -	mds_requests.erase(req->get_tid());
 -	put_request(req);
 +	unregister_request(req);
        }
      }
    }