- don't use OBD_CONNECT_FID flag for MGS/OSS

  b:15980
  i:adilger,yury

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 94f0e6b..016d8e8 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -587,10 +587,10 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb);
                                 OBD_CONNECT_TRUNCLOCK | OBD_CONNECT_INDEX | \
                                 OBD_CONNECT_BRW_SIZE | OBD_CONNECT_QUOTA64 | \
                                 OBD_CONNECT_OSS_CAPA | OBD_CONNECT_CANCELSET | \
-                                OBD_CONNECT_FID | OBD_CONNECT_CKSUM | \
+                                OBD_CONNECT_CKSUM | \
                                 LRU_RESIZE_CONNECT_FLAG)
 #define ECHO_CONNECT_SUPPORTED (0)
-#define MGS_CONNECT_SUPPORTED  (OBD_CONNECT_VERSION | OBD_CONNECT_FID)
+#define MGS_CONNECT_SUPPORTED  (OBD_CONNECT_VERSION)
 
 #define MAX_QUOTA_COUNT32 (0xffffffffULL)
 

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index cdbc8d1..3c3c186 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -76,11 +76,6 @@ static int mgs_connect(const struct lu_env *env,
                 data->ocd_version = LUSTRE_VERSION_CODE;
         }
 
-        if ((exp->exp_connect_flags & OBD_CONNECT_FID) == 0) {
-                CWARN("MGS requires FID support, but client not\n");
-                rc = -EBADE;
-        }
-
         if (rc) {
                 class_disconnect(exp);
         } else {

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index c6005ae..69dccff 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -2544,14 +2544,6 @@ static int filter_connect_internal(struct obd_export *exp,
         exp->exp_connect_flags = data->ocd_connect_flags;
         data->ocd_version = LUSTRE_VERSION_CODE;
 
-        if ((exp->exp_connect_flags & OBD_CONNECT_FID) == 0) {
-                CWARN("%s: OST requires FID support (flag="LPX64
-                      "), but client not\n",
-                      exp->exp_obd->obd_name,
-                      exp->exp_connect_flags);
-                RETURN(-EBADF);
-        }
-
         if (exp->exp_connect_flags & OBD_CONNECT_GRANT) {
                 obd_size left, want;