From 845b65be6f95ba3762491cd52e4e3bcd4ea05cbd Mon Sep 17 00:00:00 2001 From: ericm Date: Wed, 23 Apr 2008 18:00:48 +0000 Subject: [PATCH] branch: b1_6 reset AT flag on reconnects. a=nathan (original author) b=15487 r=rread r=ericm --- lustre/ldlm/ldlm_lib.c | 2 ++ lustre/ptlrpc/import.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index b17366e..bdb1ac7 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -923,6 +923,8 @@ set_flags: if (revimp->imp_msg_magic != LUSTRE_MSG_MAGIC_V1) { if (export->exp_connect_flags & OBD_CONNECT_AT) revimp->imp_msghdr_flags |= MSGHDR_AT_SUPPORT; + else + revimp->imp_msghdr_flags &= ~MSGHDR_AT_SUPPORT; } class_import_put(revimp); diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 4b96594..2d0cfa8 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -503,6 +503,8 @@ int ptlrpc_connect_import(struct obd_import *imp, char *new_uuid) /* Reset connect flags to the originally requested flags, in case * the server is updated on-the-fly we will get the new features. */ imp->imp_connect_data.ocd_connect_flags = imp->imp_connect_flags_orig; + imp->imp_msghdr_flags &= ~MSGHDR_AT_SUPPORT; + rc = obd_reconnect(imp->imp_obd->obd_self_export, obd, &obd->obd_uuid, &imp->imp_connect_data); if (rc) -- 1.8.3.1