X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_lockd.c;h=651eebe40e881b48c4f17abac5e631b9ff6e42fa;hp=807da6f61e2a98ddeec684619dd2c95f060f73f9;hb=eda984e7cb4e6a97310ed0f5e81f398dc48b56bf;hpb=6c8085515d84ec6fd8abe82b007624d67927d089

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 807da6f..651eebe 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -669,6 +669,23 @@ static int ldlm_handle_ast_error(struct ldlm_lock *lock,
 				   libcfs_nid2str(peer.nid));
 			ldlm_lock_cancel(lock);
 			rc = -ERESTART;
+		} else if (rc == -ENODEV || rc == -ESHUTDOWN ||
+			   (rc == -EIO &&
+			    req->rq_import->imp_state == LUSTRE_IMP_CLOSED)) {
+			/* Upon umount process the AST fails because cannot be
+			 * sent. This shouldn't lead to the client eviction.
+			 * -ENODEV error is returned by ptl_send_rpc() for
+			 *  new request in such import.
+			 * -SHUTDOWN is returned by ptlrpc_import_delay_req()
+			 *  if imp_invalid is set or obd_no_recov.
+			 * Meanwhile there is also check for LUSTRE_IMP_CLOSED
+			 * in ptlrpc_import_delay_req() as well with -EIO code.
+			 * In all such cases errors are ignored.
+			 */
+			LDLM_DEBUG(lock, "%s AST can't be sent due to a server"
+					 " %s failure or umount process: rc = %d\n",
+					 ast_type,
+					 req->rq_import->imp_obd->obd_name, rc);
 		} else {
 			LDLM_ERROR(lock,
 				   "client (nid %s) %s %s AST (req@%p x%llu status %d rc %d), evict it",