mds: only check for canceled _client_ requests, not slaves

Slave requests don't get added to the session request list.
att · Mar 9, 2010 · 72e04c8 · 72e04c8
1 parent 233d2d8
commit 72e04c8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
@@ -6373,12 +6373,11 @@ void MDCache::request_forward(MDRequest *mdr, int who, int port)
 
 void MDCache::dispatch_request(MDRequest *mdr)
 {
-  if (!mdr->session_request_item.is_on_xlist()) {
-    dout(10) << "request " << *mdr << " is canceled" << dendl;
-    return;
-  }
-
   if (mdr->client_request) {
+    if (!mdr->session_request_item.is_on_xlist()) {
+      dout(10) << "request " << *mdr << " is canceled" << dendl;
+      return;
+    }
     mds->server->dispatch_client_request(mdr);
   } else if (mdr->slave_request) {
     mds->server->dispatch_slave_request(mdr);