LU-13550 osd-zfs: snapshot with incompatible clients

[fs/lustre-release.git] / lustre / mgs / mgs_barrier.c

diff --git a/lustre/mgs/mgs_barrier.c b/lustre/mgs/mgs_barrier.c
index 7ea0915..9087055 100644 (file)
--- a/lustre/mgs/mgs_barrier.c
+++ b/lustre/mgs/mgs_barrier.c
@@ -121,7 +121,7 @@ static int mgs_barrier_glimpse_lock(const struct lu_env *env,
        struct ldlm_resource *res;
        struct ldlm_glimpse_work *work;
        struct ldlm_glimpse_work *tmp;
-       struct list_head gl_list = LIST_HEAD_INIT(gl_list);
+       LIST_HEAD(gl_list);
        struct list_head *pos;
        int i;
        int rc;
@@ -129,7 +129,7 @@ static int mgs_barrier_glimpse_lock(const struct lu_env *env,
 
        LASSERT(fsdb->fsdb_mdt_count > 0);
 
-       rc = mgc_logname2resid(fsdb->fsdb_name, &res_id, CONFIG_T_BARRIER);
+       rc = mgc_logname2resid(fsdb->fsdb_name, &res_id, MGS_CFG_T_BARRIER);
        if (rc)
                RETURN(rc);
 
@@ -254,6 +254,22 @@ bool mgs_barrier_expired(struct fs_db *fsdb, time64_t timeout)
        return expired > ktime_get_real_seconds();
 }
 
+static inline bool mgs_barrier_tests_disabled(struct barrier_ctl *bc,
+                                             struct obd_export *exp,
+                                             struct fs_db *fsdb)
+{
+       __u64 flags = exp_connect_flags(exp);
+
+       if ((flags & OBD_CONNECT_MDS_MDS) && !(flags & OBD_CONNECT_BARRIER)) {
+               fsdb->fsdb_barrier_disabled = 1;
+               LCONSOLE_WARN("%s: Barrier incompatible connection %s\n",
+                             bc->bc_name,
+                             obd_uuid2str(&exp->exp_client_uuid));
+               return true;
+       }
+       return false;
+}
+
 /**
  * Create the barrier for the given instance.
  *
@@ -330,12 +346,8 @@ static int mgs_barrier_freeze(const struct lu_env *env,
                        spin_lock(&mgs_obd->obd_dev_lock);
                        list_for_each_entry(exp, &mgs_obd->obd_exports,
                                            exp_obd_chain) {
-                               __u64 flags = exp_connect_flags(exp);
-                               if (!!(flags & OBD_CONNECT_MDS_MDS) &&
-                                   !(flags & OBD_CONNECT_BARRIER)) {
-                                       fsdb->fsdb_barrier_disabled = 1;
+                               if (mgs_barrier_tests_disabled(bc, exp, fsdb))
                                        break;
-                               }
                        }
                        spin_unlock(&mgs_obd->obd_dev_lock);
                }
@@ -489,12 +501,8 @@ static int mgs_barrier_thaw(const struct lu_env *env,
                        spin_lock(&mgs_obd->obd_dev_lock);
                        list_for_each_entry(exp, &mgs_obd->obd_exports,
                                            exp_obd_chain) {
-                               __u64 flags = exp_connect_flags(exp);
-                               if (!!(flags & OBD_CONNECT_MDS_MDS) &&
-                                   !(flags & OBD_CONNECT_BARRIER)) {
-                                       fsdb->fsdb_barrier_disabled = 1;
+                               if (mgs_barrier_tests_disabled(bc, exp, fsdb))
                                        break;
-                               }
                        }
                        spin_unlock(&mgs_obd->obd_dev_lock);
                }
@@ -656,12 +664,8 @@ static int mgs_barrier_rescan(const struct lu_env *env,
                spin_lock(&mgs_obd->obd_dev_lock);
                list_for_each_entry(exp, &mgs_obd->obd_exports,
                                    exp_obd_chain) {
-                       __u64 flags = exp_connect_flags(exp);
-                       if (!!(flags & OBD_CONNECT_MDS_MDS) &&
-                           !(flags & OBD_CONNECT_BARRIER)) {
-                               b_fsdb->fsdb_barrier_disabled = 1;
+                       if (mgs_barrier_tests_disabled(bc, exp, b_fsdb))
                                break;
-                       }
                }
                spin_unlock(&mgs_obd->obd_dev_lock);
        }