From: Greg Farnum Date: Mon, 19 Apr 2010 21:22:50 +0000 (-0700) Subject: mds: fix erroneous uses of send_message that need to be send_message_client X-Git-Tag: v0.22~625^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09366cbf2158cdec933e33557248baa6fbd56b4f;p=ceph.git mds: fix erroneous uses of send_message that need to be send_message_client --- diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 595a95f08a0b..2d17c129f7d8 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1709,7 +1709,7 @@ void Locker::handle_client_caps(MClientCaps *m) } if (!_do_cap_update(in, cap, m->get_dirty(), follows, m, ack)) { if (ack) - mds->send_message(ack, m->get_connection()); + mds->send_message_client(ack, m->get_connection()); eval_cap_gather(in); } @@ -1774,7 +1774,7 @@ void Locker::handle_client_caps(MClientCaps *m) } else { // no update, ack now. if (ack) - mds->send_message(ack, m->get_connection()); + mds->send_message_client(ack, m->get_connection()); bool did_issue = eval(in, CEPH_CAP_LOCKS); if (!did_issue && (cap->wanted() & ~cap->pending())) @@ -2168,7 +2168,7 @@ void Locker::handle_client_lease(MClientLease *m) now += mdcache->client_lease_durations[pool]; mdcache->touch_client_lease(l, pool, now); - mds->send_message(m, m->get_connection()); + mds->send_message_client(m, m->get_connection()); } break; diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 1eb035351216..b921e5d06225 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -605,7 +605,7 @@ void Server::handle_client_reconnect(MClientReconnect *m) fake_inode.ino = p->first; MClientCaps *stale = new MClientCaps(CEPH_CAP_OP_EXPORT, p->first, 0, 0, 0); //stale->head.migrate_seq = 0; // FIXME ****** - mds->send_message(stale, m->get_connection()); + mds->send_message_client(stale, m->get_connection()); // add to cap export list. mdcache->rejoin_export_caps(p->first, from, p->second);