LU-2725 ost: ost_rw_hpreq_check should return 0 or 1

[fs/lustre-release.git] / lustre / fld / fld_handler.c

diff --git a/lustre/fld/fld_handler.c b/lustre/fld/fld_handler.c
index 0ee6852..9094843 100644 (file)
--- a/lustre/fld/fld_handler.c
+++ b/lustre/fld/fld_handler.c
@@ -239,12 +239,10 @@ static int fld_req_handle(struct ptlrpc_request *req,
                 *out = *in;
 
                /* For old 2.0 client, the 'lsr_flags' is uninitialized.
-                * Set it as 'LU_SEQ_RANGE_MDT' by default.
-                * Old 2.0 liblustre client cannot talk with new 2.1 server. */
-               if (!(exp->exp_connect_flags & OBD_CONNECT_64BITHASH) &&
-                   !((exp->exp_connect_flags & OBD_CONNECT_MDS) &&
-                     (exp->exp_connect_flags & OBD_CONNECT_FID)) &&
-                   !(exp->exp_connect_flags & OBD_CONNECT_LIGHTWEIGHT) &&
+                * Set it as 'LU_SEQ_RANGE_MDT' by default. */
+               if (!(exp_connect_flags(exp) & OBD_CONNECT_64BITHASH) &&
+                   !(exp_connect_flags(exp) & OBD_CONNECT_MDS_MDS) &&
+                   !(exp_connect_flags(exp) & OBD_CONNECT_LIGHTWEIGHT) &&
                    !exp->exp_libclient)
                        out->lsr_flags = LU_SEQ_RANGE_MDT;
 
@@ -421,9 +419,10 @@ int fld_server_init(const struct lu_env *env, struct lu_server_fld *fld,
 
         fld->lsf_control_exp = NULL;
 
-        /* Insert reserved sequence number of ".lustre" into fld cache. */
        if (lsr_flags == LU_SEQ_RANGE_MDT) {
-               range.lsr_start = FID_SEQ_DOT_LUSTRE;
+               /* Insert reserved sequence of "ROOT" and ".lustre"
+                * into fld cache. */
+               range.lsr_start = FID_SEQ_LOCAL_FILE;
                range.lsr_end = FID_SEQ_DOT_LUSTRE + 1;
                range.lsr_index = 0;
                range.lsr_flags = lsr_flags;