LU-8359 ldlm: Wrong evict during failover

[fs/lustre-release.git] / lustre / include / obd_class.h

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index 2f85a99..0fafed0 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -317,8 +317,7 @@ void class_disconnect_stale_exports(struct obd_device *,
                                     int (*test_export)(struct obd_export *));
 static inline enum obd_option exp_flags_from_obd(struct obd_device *obd)
 {
-        return ((obd->obd_fail ? OBD_OPT_FAILOVER : 0) |
-                (obd->obd_force ? OBD_OPT_FORCE : 0) |
+        return ((obd->obd_force ? OBD_OPT_FORCE : 0) |
                 (obd->obd_abort_recovery ? OBD_OPT_ABORT_RECOV : 0) |
                 0);
 }
@@ -433,77 +432,74 @@ do {                                                            \
 
 static inline int lprocfs_nid_ldlm_stats_init(struct nid_stat* tmp)
 {
-        /* Always add in ldlm_stats */
-        tmp->nid_ldlm_stats = lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC
-                                                  ,LPROCFS_STATS_FLAG_NOPERCPU);
-        if (tmp->nid_ldlm_stats == NULL)
-                return -ENOMEM;
-
-        lprocfs_init_ldlm_stats(tmp->nid_ldlm_stats);
-
-        return lprocfs_register_stats(tmp->nid_proc, "ldlm_stats",
-                                      tmp->nid_ldlm_stats);
-}
-
-#define EXP_CHECK_MD_OP(exp, op)                                \
-do {                                                            \
-        if ((exp) == NULL) {                                    \
-                CERROR("obd_" #op ": NULL export\n");           \
-                RETURN(-ENODEV);                                \
-        }                                                       \
-        if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {   \
-                CERROR("obd_" #op ": cleaned up obd\n");        \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
-        if (!OBT((exp)->exp_obd) || !MDP((exp)->exp_obd, op)) { \
-                CERROR("obd_" #op ": dev %s/%d no operation\n", \
-                       (exp)->exp_obd->obd_name,                \
-                       (exp)->exp_obd->obd_minor);              \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
+       /* Always add in ldlm_stats */
+       tmp->nid_ldlm_stats =
+               lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC,
+                                   LPROCFS_STATS_FLAG_NOPERCPU);
+       if (tmp->nid_ldlm_stats == NULL)
+               return -ENOMEM;
+
+       lprocfs_init_ldlm_stats(tmp->nid_ldlm_stats);
+
+       return lprocfs_register_stats(tmp->nid_proc, "ldlm_stats",
+                                     tmp->nid_ldlm_stats);
+}
+
+#define EXP_CHECK_MD_OP(exp, op)                                       \
+do {                                                                   \
+       if ((exp) == NULL) {                                            \
+               CERROR("obd_" #op ": NULL export\n");                   \
+               RETURN(-ENODEV);                                        \
+       }                                                               \
+       if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {           \
+               CERROR("obd_" #op ": cleaned up obd\n");                \
+               RETURN(-EOPNOTSUPP);                                    \
+       }                                                               \
+       if (!OBT((exp)->exp_obd) || !MDP((exp)->exp_obd, op)) {         \
+               CERROR("%s: obd_" #op ": dev %d no operation\n",        \
+                      (exp)->exp_obd->obd_name,                        \
+                      (exp)->exp_obd->obd_minor);                      \
+               RETURN(-EOPNOTSUPP);                                    \
+       }                                                               \
 } while (0)
 
 
-#define OBD_CHECK_DT_OP(obd, op, err)                           \
-do {                                                            \
-        if (!OBT(obd) || !OBP((obd), op)) {                     \
-                if (err)                                        \
-                        CERROR("obd_" #op ": dev %d no operation\n",    \
-                               obd->obd_minor);                 \
-                RETURN(err);                                    \
-        }                                                       \
+#define OBD_CHECK_DT_OP(obd, op, err)                                  \
+do {                                                                   \
+       if (!OBT(obd) || !OBP((obd), op)) {                             \
+               if (err)                                                \
+                       CERROR("%s: no obd_" #op " operation\n",        \
+                              obd->obd_name);                          \
+               RETURN(err);                                            \
+       }                                                               \
 } while (0)
 
-#define EXP_CHECK_DT_OP(exp, op)                                \
-do {                                                            \
-        if ((exp) == NULL) {                                    \
-                CERROR("obd_" #op ": NULL export\n");           \
-                RETURN(-ENODEV);                                \
-        }                                                       \
-        if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {   \
-                CERROR("obd_" #op ": cleaned up obd\n");        \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
-        if (!OBT((exp)->exp_obd) || !OBP((exp)->exp_obd, op)) { \
-                CERROR("obd_" #op ": dev %d no operation\n",    \
-                       (exp)->exp_obd->obd_minor);              \
-                RETURN(-EOPNOTSUPP);                            \
-        }                                                       \
+#define EXP_CHECK_DT_OP(exp, op)                                       \
+do {                                                                   \
+       if ((exp) == NULL) {                                            \
+               CERROR("obd_" #op ": NULL export\n");                   \
+               RETURN(-ENODEV);                                        \
+       }                                                               \
+       if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {           \
+               CERROR("obd_" #op ": cleaned up obd\n");                \
+               RETURN(-EOPNOTSUPP);                                    \
+       }                                                               \
+       OBD_CHECK_DT_OP((exp)->exp_obd, op, -EOPNOTSUPP);               \
 } while (0)
 
-#define CTXT_CHECK_OP(ctxt, op, err)                                 \
-do {                                                                 \
-        if (!OBT(ctxt->loc_obd) || !CTXTP((ctxt), op)) {             \
-                if (err)                                             \
-                        CERROR("lop_" #op ": dev %d no operation\n", \
-                               ctxt->loc_obd->obd_minor);            \
-                RETURN(err);                                         \
-        }                                                            \
+#define CTXT_CHECK_OP(ctxt, op, err)                                   \
+do {                                                                   \
+       if (!OBT(ctxt->loc_obd) || !CTXTP((ctxt), op)) {                \
+               if (err)                                                \
+                       CERROR("%s: no lop_" #op "operation\n",         \
+                              ctxt->loc_obd->obd_name);                \
+               RETURN(err);                                            \
+       }                                                               \
 } while (0)
 
 static inline int class_devno_max(void)
 {
-        return MAX_OBD_DEVICES;
+       return MAX_OBD_DEVICES;
 }
 
 static inline int obd_get_info(const struct lu_env *env, struct obd_export *exp,
@@ -1713,6 +1709,7 @@ int server_name2index(const char *svname, __u32 *idx, const char **endptr);
 
 /* linux-module.c */
 extern struct miscdevice obd_psdev;
+int obd_ioctl_getdata(char **buf, int *len, void __user *arg);
 int class_procfs_init(void);
 int class_procfs_clean(void);