(1) Do not call server_deregister_mount unless ref conut is zero.

(2) Enable acl under default mode.

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index c46f556..2b57da3 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -3213,6 +3213,48 @@ static void mdt_fini(const struct lu_env *env, struct mdt_device *m)
         EXIT;
 }
 
+static void fsoptions_to_mdt_flags(struct mdt_device *m, char *options)
+{
+        char *p = options;
+
+        if (!options)
+                return;
+
+        while (*options) {
+                int len;
+
+                while (*p && *p != ',')
+                        p++;
+
+                len = p - options;
+                if ((len == sizeof("user_xattr") - 1) &&
+                    (memcmp(options, "user_xattr", len) == 0)) {
+                        m->mdt_opts.mo_user_xattr = 1;
+                        LCONSOLE_INFO("Enabling user_xattr\n");
+                } else if ((len == sizeof("nouser_xattr") - 1) &&
+                           (memcmp(options, "nouser_xattr", len) == 0)) {
+                        m->mdt_opts.mo_user_xattr = 0;
+                        LCONSOLE_INFO("Disabling user_xattr\n");
+                } else if ((len == sizeof("acl") - 1) &&
+                           (memcmp(options, "acl", len) == 0)) {
+#ifdef CONFIG_FS_POSIX_ACL
+                        m->mdt_opts.mo_acl = 1;
+                        LCONSOLE_INFO("Enabling ACL\n");
+#else
+                        CWARN("ignoring unsupported acl mount option\n");
+#endif
+                } else if ((len == sizeof("noacl") - 1) &&
+                           (memcmp(options, "noacl", len) == 0)) {
+#ifdef CONFIG_FS_POSIX_ACL
+                        m->mdt_opts.mo_acl = 0;
+                        LCONSOLE_INFO("Disabling ACL\n");
+#endif
+                }
+
+                options = ++p;
+        }
+}
+
 int mdt_postrecov(const struct lu_env *, struct mdt_device *);
 
 static int mdt_init0(const struct lu_env *env, struct mdt_device *m,
@@ -3223,6 +3265,8 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m,
         struct obd_device         *obd;
         const char                *dev = lustre_cfg_string(cfg, 0);
         const char                *num = lustre_cfg_string(cfg, 2);
+        struct lustre_mount_info  *lmi;
+        struct lustre_sb_info     *lsi;
         struct lu_site            *s;
         int                        rc;
         ENTRY;
@@ -3238,10 +3282,17 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m,
         m->mdt_max_mdsize = MAX_MD_SIZE;
         m->mdt_max_cookiesize = sizeof(struct llog_cookie);
 
+        lmi = server_get_mount(dev);
+        if (lmi == NULL) {
+                CERROR("Cannot get mount info for %s!\n", dev);
+                RETURN(-EFAULT);
+        }
+
+        lsi = s2lsi(lmi->lmi_sb);
+        fsoptions_to_mdt_flags(m, lsi->lsi_lmd->lmd_opts);
+        server_put_mount(dev, lmi->lmi_mnt);
+
         spin_lock_init(&m->mdt_ioepoch_lock);
-        /* Temporary. should parse mount option. */
-        m->mdt_opts.mo_user_xattr = 0;
-        m->mdt_opts.mo_acl = 0;
         m->mdt_opts.mo_compat_resname = 0;
         m->mdt_capa_timeout = CAPA_TIMEOUT;
         m->mdt_capa_alg = CAPA_HMAC_ALG_SHA1;
@@ -3523,12 +3574,14 @@ static int mdt_connect_internal(struct obd_export *exp,
                 exp->exp_mdt_data.med_ibits_known = data->ocd_ibits_known;
         }
 
+#if 0
         if (mdt->mdt_opts.mo_acl &&
             ((exp->exp_connect_flags & OBD_CONNECT_ACL) == 0)) {
                 CWARN("%s: MDS requires ACL support but client does not\n",
                       mdt->mdt_md_dev.md_lu_dev.ld_obd->obd_name);
                 return -EBADE;
         }
+#endif
 
         flags = OBD_CONNECT_LCL_CLIENT | OBD_CONNECT_RMT_CLIENT;
         if ((exp->exp_connect_flags & flags) == flags) {

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 6931118..8fd5f84 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -201,10 +201,10 @@ int server_put_mount(const char *name, struct vfsmount *mnt)
                 if (atomic_read(&lmi->lmi_mnt->mnt_count) > 1)
                         CERROR("%s: mount busy, vfscount=%d!\n", name,
                                atomic_read(&lmi->lmi_mnt->mnt_count));
-        }
 
-        /* this obd should never need the mount again */
-        server_deregister_mount(name);
+                /* this obd should never need the mount again */
+                server_deregister_mount(name);
+        }
 
         RETURN(0);
 }