Whamcloud - gitweb
Branch HEAD
[fs/lustre-release.git] / lustre / obdclass / obd_mount.c
index 0dd655e..202c740 100644 (file)
 #include <lustre_param.h>
 
 static int (*client_fill_super)(struct super_block *sb) = NULL;
+static void (*kill_super_cb)(struct super_block *sb) = NULL;
 
 /*********** mount lookup *********/
 
 DECLARE_MUTEX(lustre_mount_info_lock);
 struct list_head server_mount_info_list = LIST_HEAD_INIT(server_mount_info_list);
 
-static struct lustre_mount_info *server_find_mount(char *name)
+static struct lustre_mount_info *server_find_mount(const char *name)
 {
         struct list_head *tmp;
         struct lustre_mount_info *lmi;
@@ -63,7 +64,7 @@ static struct lustre_mount_info *server_find_mount(char *name)
 /* we must register an obd for a mount before we call the setup routine.
    *_setup will call lustre_get_mount to get the mnt struct
    by obd_name, since we can't pass the pointer to setup. */
-static int server_register_mount(char *name, struct super_block *sb,
+static int server_register_mount(const char *name, struct super_block *sb,
                           struct vfsmount *mnt)
 {
         struct lustre_mount_info *lmi;
@@ -106,7 +107,7 @@ static int server_register_mount(char *name, struct super_block *sb,
 }
 
 /* when an obd no longer needs a mount */
-static int server_deregister_mount(char *name)
+static int server_deregister_mount(const char *name)
 {
         struct lustre_mount_info *lmi;
         ENTRY;
@@ -133,7 +134,7 @@ static int server_deregister_mount(char *name)
 /* obd's look up a registered mount using their obdname. This is just
    for initial obd setup to find the mount struct.  It should not be
    called every time you want to mntget. */
-struct lustre_mount_info *server_get_mount(char *name)
+struct lustre_mount_info *server_get_mount(const char *name)
 {
         struct lustre_mount_info *lmi;
         struct lustre_sb_info *lsi;
@@ -157,6 +158,25 @@ struct lustre_mount_info *server_get_mount(char *name)
         RETURN(lmi);
 }
 
+/*
+ * Used by mdt to get mount_info from obdname.
+ * There are no blocking when using the mount_info.
+ * Do not use server_get_mount for this purpose.
+ */
+struct lustre_mount_info *server_get_mount_2(const char *name)
+{
+        struct lustre_mount_info *lmi;
+        ENTRY;
+
+        down(&lustre_mount_info_lock);
+        lmi = server_find_mount(name);
+        up(&lustre_mount_info_lock);
+        if (!lmi)
+                CERROR("Can't find mount for %s\n", name);
+
+        RETURN(lmi);
+}
+
 static void unlock_mntput(struct vfsmount *mnt)
 {
         if (kernel_locked()) {
@@ -171,7 +191,7 @@ static void unlock_mntput(struct vfsmount *mnt)
 static int lustre_put_lsi(struct super_block *sb);
 
 /* to be called from obd_cleanup methods */
-int server_put_mount(char *name, struct vfsmount *mnt)
+int server_put_mount(const char *name, struct vfsmount *mnt)
 {
         struct lustre_mount_info *lmi;
         struct lustre_sb_info *lsi;
@@ -180,7 +200,7 @@ int server_put_mount(char *name, struct vfsmount *mnt)
 
         /* This might be the last one, can't deref after this */
         unlock_mntput(mnt);
-        
+
         down(&lustre_mount_info_lock);
         lmi = server_find_mount(name);
         up(&lustre_mount_info_lock);
@@ -208,9 +228,16 @@ int server_put_mount(char *name, struct vfsmount *mnt)
         RETURN(0);
 }
 
+/* Corresponding to server_get_mount_2 */
+int server_put_mount_2(const char *name, struct vfsmount *mnt)
+{
+        ENTRY;
+        RETURN(0);
+}
 
 /******* mount helper utilities *********/
 
+#if 0
 static void ldd_print(struct lustre_disk_data *ldd)
 {
         PRINT_CMD(PRINT_MASK, "  disk data:\n");
@@ -225,6 +252,7 @@ static void ldd_print(struct lustre_disk_data *ldd)
         PRINT_CMD(PRINT_MASK, "params:  %s\n", ldd->ldd_params);
         PRINT_CMD(PRINT_MASK, "comment: %s\n", ldd->ldd_userdata);
 }
+#endif
 
 static int ldd_parse(struct lvfs_run_ctxt *mount_ctxt,
                            struct lustre_disk_data *ldd)
@@ -245,7 +273,7 @@ static int ldd_parse(struct lvfs_run_ctxt *mount_ctxt,
                 GOTO(out, rc);
         }
 
-        len = file->f_dentry->d_inode->i_size;
+        len = i_size_read(file->f_dentry->d_inode);
         CDEBUG(D_MOUNT, "Have %s, size %lu\n", MOUNT_DATA_FILE, len);
         if (len != sizeof(*ldd)) {
                 CERROR("disk data size does not match: see %lu expect "LPSZ"\n",
@@ -282,8 +310,6 @@ static int ldd_parse(struct lvfs_run_ctxt *mount_ctxt,
                 GOTO(out_close, rc = -EINVAL);
         }
 
-        ldd_print(ldd);
-
 out_close:
         filp_close(file, 0);
 out:
@@ -322,7 +348,6 @@ static int ldd_write(struct lvfs_run_ctxt *mount_ctxt,
         }
 
         rc = 0;
-        ldd_print(ldd);
 
 out_close:
         filp_close(file, 0);
@@ -362,19 +387,20 @@ int lustre_process_log(struct super_block *sb, char *logname,
         lustre_cfg_free(lcfg);
 
         if (rc == -EINVAL)
-                LCONSOLE_ERROR("%s: The configuration from log '%s' failed "
-                               "(%d). Make sure this client and "
-                               "the MGS are running compatible versions of "
-                               "Lustre.\n",
-                               mgc->obd_name, logname, rc);
+                LCONSOLE_ERROR_MSG(0x15b, "%s: The configuration from log '%s'"
+                                   "failed from the MGS (%d).  Make sure this "
+                                   "client and the MGS are running compatible "
+                                   "versions of Lustre.\n",
+                                   mgc->obd_name, logname, rc);
 
         if (rc)
-                LCONSOLE_ERROR("%s: The configuration from log '%s' failed "
-                               "(%d). This may be the result of "
-                               "communication errors between this node and "
-                               "the MGS, a bad configuration, or other errors."
-                               " See the syslog for more information.\n",
-                               mgc->obd_name, logname, rc);
+                LCONSOLE_ERROR_MSG(0x15c, "%s: The configuration from log '%s' "
+                                   "failed (%d). This may be the result of "
+                                   "communication errors between this node and "
+                                   "the MGS, a bad configuration, or other "
+                                   "errors. See the syslog for more "
+                                   "information.\n", mgc->obd_name, logname, 
+                                   rc);
 
         /* class_obd_list(); */
         RETURN(rc);
@@ -468,8 +494,9 @@ static int server_start_mgs(struct super_block *sb)
         lmi = server_find_mount(LUSTRE_MGS_OBDNAME);
         if (lmi) {
                 lsi = s2lsi(lmi->lmi_sb);
-                LCONSOLE_ERROR("The MGS service was already started from "
-                               "server %s\n", lsi->lsi_ldd->ldd_svname);
+                LCONSOLE_ERROR_MSG(0x15d, "The MGS service was already started"
+                                   " from server %s\n",
+                                   lsi->lsi_ldd->ldd_svname);
                 RETURN(-EALREADY);
         }
 
@@ -483,9 +510,9 @@ static int server_start_mgs(struct super_block *sb)
                 server_deregister_mount(LUSTRE_MGS_OBDNAME);
 
         if (rc)
-                LCONSOLE_ERROR("Failed to start MGS '%s' (%d).  Is the 'mgs' "
-                               "module loaded?\n", LUSTRE_MGS_OBDNAME, rc);
-
+                LCONSOLE_ERROR_MSG(0x15e, "Failed to start MGS '%s' (%d). "
+                                   "Is the 'mgs' module loaded?\n",
+                                   LUSTRE_MGS_OBDNAME, rc);
         RETURN(rc);
 }
 
@@ -695,9 +722,8 @@ static int lustre_start_mgc(struct super_block *sb)
         if (rc)
                 /* nonfatal */
                 CERROR("can't set %s %d\n", KEY_INIT_RECOV_BACKUP, rc);
-
         /* We connect to the MGS at setup, and don't disconnect until cleanup */
-        rc = obd_connect(&mgc_conn, obd, &(obd->obd_uuid), &ocd);
+        rc = obd_connect(NULL, &mgc_conn, obd, &(obd->obd_uuid), &ocd);
         if (rc) {
                 CERROR("connect failed %d\n", rc);
                 GOTO(out, rc);
@@ -870,11 +896,82 @@ int server_mti_print(char *title, struct mgs_target_info *mti)
         return(0);
 }
 
+static
+int mti_set_sec_opts(struct mgs_target_info *mti, struct lustre_mount_data *lmd)
+{
+        char *s1, *s2;
+
+        if (lmd->lmd_sec_mdt == NULL && lmd->lmd_sec_cli == NULL) {
+                /* just let on-disk params do its work. but we have an
+                 * assumption that any changes of on-disk data by tune2fs
+                 * should lead to server rewrite log.
+                 */
+                return 0;
+        }
+
+        /* filter out existing sec options */
+        s1 = mti->mti_params;
+        while (*s1) {
+                int clear;
+
+                while (*s1 == ' ')
+                        s1++;
+
+                if (strncmp(s1, PARAM_SEC_RPC_MDT,
+                            sizeof(PARAM_SEC_RPC_MDT) - 1) == 0 ||
+                    strncmp(s1, PARAM_SEC_RPC_CLI,
+                            sizeof(PARAM_SEC_RPC_CLI) - 1) == 0)
+                        clear = 1;
+                else
+                        clear = 0;
+
+                s2 = strchr(s1, ' ');
+                if (s2 == NULL) {
+                        if (clear)
+                                *s1 = '\0';
+                        break;
+                }
+                s2++;
+                if (clear)
+                        memmove(s1, s2, strlen(s2) + 1);
+                else
+                        s1 = s2;
+        }
+
+        /* append sec options from lmd */
+        /* FIXME add flag LDD_F_UPDATE after mountconf start supporting
+         * log updating.
+         */
+        if (lmd->lmd_sec_mdt) {
+                if (strlen(mti->mti_params) + strlen(lmd->lmd_sec_mdt) +
+                    sizeof(PARAM_SEC_RPC_MDT) + 1 >= sizeof(mti->mti_params)) {
+                        CERROR("security params too big for mti\n");
+                        return -ENOMEM;
+                }
+                strcat(mti->mti_params, " "PARAM_SEC_RPC_MDT);
+                strcat(mti->mti_params, lmd->lmd_sec_mdt);
+                //mti->mti_flags |= LDD_F_UPDATE;
+        }
+        if (lmd->lmd_sec_cli) {
+                if (strlen(mti->mti_params) + strlen(lmd->lmd_sec_cli) +
+                    sizeof(PARAM_SEC_RPC_CLI) + 2 > sizeof(mti->mti_params)) {
+                        CERROR("security params too big for mti\n");
+                        return -ENOMEM;
+                }
+                strcat(mti->mti_params, " "PARAM_SEC_RPC_CLI);
+                strcat(mti->mti_params, lmd->lmd_sec_cli);
+                //mti->mti_flags |= LDD_F_UPDATE;
+        }
+
+        return 0;
+}
+
 static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti)
 {
-        struct lustre_sb_info   *lsi = s2lsi(sb);
-        struct lustre_disk_data *ldd = lsi->lsi_ldd;
-        lnet_process_id_t        id;
+        struct lustre_sb_info    *lsi = s2lsi(sb);
+        struct lustre_disk_data  *ldd = lsi->lsi_ldd;
+        struct lustre_mount_data *lmd = lsi->lsi_lmd;
+        lnet_process_id_t         id;
         int i = 0;
         ENTRY;
 
@@ -909,7 +1006,8 @@ static int server_sb2mti(struct super_block *sb, struct mgs_target_info *mti)
                 RETURN(-ENOMEM);
         }
         memcpy(mti->mti_params, ldd->ldd_params, sizeof(mti->mti_params));
-        RETURN(0);
+
+        RETURN(mti_set_sec_opts(mti, lmd));
 }
 
 /* Register an old or new target with the MGS. If needed MGS will construct
@@ -966,7 +1064,6 @@ int server_register_target(struct super_block *sb)
                         sizeof(ldd->ldd_svname));
                 /* or ldd_make_sv_name(ldd); */
                 ldd_write(&mgc->obd_lvfs_ctxt, ldd);
-
                 err = fsfilt_set_label(mgc, lsi->lsi_srv_mnt->mnt_sb,
                                        mti->mti_svname);
                 if (err)
@@ -996,6 +1093,7 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt)
 
         CDEBUG(D_MOUNT, "starting target %s\n", lsi->lsi_ldd->ldd_svname);
 
+#if 0
         /* If we're an MDT, make sure the global MDS is running */
         if (lsi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_MDT) {
                 /* make sure the MDS is started */
@@ -1015,6 +1113,7 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt)
                 }
                 mutex_up(&server_start_lock);
         }
+#endif
 
         /* If we're an OST, make sure the global OSS is running */
         if (lsi->lsi_ldd->ldd_flags & LDD_F_SV_TYPE_OST) {
@@ -1048,15 +1147,16 @@ static int server_start_targets(struct super_block *sb, struct vfsmount *mnt)
                 CERROR("Required registration failed for %s: %d\n",
                        lsi->lsi_ldd->ldd_svname, rc);
                 if (rc == -EIO) {
-                        LCONSOLE_ERROR("Communication error with the MGS.  Is "
-                                       "the MGS running?\n");
+                        LCONSOLE_ERROR_MSG(0x15f, "Communication error with "
+                                           "the MGS.  Is the MGS running?\n");
                 }
                 GOTO(out_mgc, rc);
         }
         if (rc == -EINVAL) {
-                LCONSOLE_ERROR("The MGS is refusing to allow this server (%s) "
-                               "to start.  Please see messages on the MGS node."
-                               "\n", lsi->lsi_ldd->ldd_svname);
+                LCONSOLE_ERROR_MSG(0x160, "The MGS is refusing to allow this "
+                                   "server (%s) to start. Please see messages"
+                                   " on the MGS node.\n",
+                                   lsi->lsi_ldd->ldd_svname);
                 GOTO(out_mgc, rc);
         }
 
@@ -1094,7 +1194,7 @@ out_mgc:
                 }
 
                 /* log has been fully processed */
-                obd_notify(obd, NULL, OBD_NOTIFY_CONFIG, 0);
+                obd_notify(obd, NULL, OBD_NOTIFY_CONFIG, (void *)CONFIG_LOG);
         }
 
         RETURN(rc);
@@ -1123,6 +1223,9 @@ struct lustre_sb_info *lustre_init_lsi(struct super_block *sb)
 
         /* Default umount style */
         lsi->lsi_flags = LSI_UMOUNT_FAILOVER;
+
+        lsi->lsi_lmd->lmd_nllu = NOBODY_UID;
+        lsi->lsi_lmd->lmd_nllg = NOBODY_GID;
         RETURN(lsi);
 }
 
@@ -1149,6 +1252,12 @@ static int lustre_free_lsi(struct super_block *sb)
                 if (lsi->lsi_lmd->lmd_profile != NULL)
                         OBD_FREE(lsi->lsi_lmd->lmd_profile,
                                  strlen(lsi->lsi_lmd->lmd_profile) + 1);
+                if (lsi->lsi_lmd->lmd_sec_mdt != NULL)
+                        OBD_FREE(lsi->lsi_lmd->lmd_sec_mdt,
+                                 strlen(lsi->lsi_lmd->lmd_sec_mdt) + 1);
+                if (lsi->lsi_lmd->lmd_sec_cli != NULL)
+                        OBD_FREE(lsi->lsi_lmd->lmd_sec_cli,
+                                 strlen(lsi->lsi_lmd->lmd_sec_cli) + 1);
                 if (lsi->lsi_lmd->lmd_opts != NULL)
                         OBD_FREE(lsi->lsi_lmd->lmd_opts,
                                  strlen(lsi->lsi_lmd->lmd_opts) + 1);
@@ -1160,7 +1269,6 @@ static int lustre_free_lsi(struct super_block *sb)
         }
 
         LASSERT(lsi->lsi_llsbi == NULL);
-
         OBD_FREE(lsi, sizeof(*lsi));
         s2lsi_nocast(sb) = NULL;
 
@@ -1213,25 +1321,10 @@ static struct vfsmount *server_kernel_mount(struct super_block *sb)
         mnt = ll_kern_mount("ldiskfs", s_flags, lmd->lmd_dev, 0);
         if (IS_ERR(mnt)) {
                 rc = PTR_ERR(mnt);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-                /* 2.6 kernels: if ldiskfs fails, try ldiskfs2 */
-                mnt = ll_kern_mount("ldiskfs2", s_flags, lmd->lmd_dev, 0);
-                if (IS_ERR(mnt)) {
-                        int rc2 = PTR_ERR(mnt);
-                        CERROR("premount %s:%#lx ldiskfs failed: %d, ldiskfs2 "
-                               "failed: %d.  Is the ldiskfs module available?\n",
-                               lmd->lmd_dev, s_flags, rc, rc2);
-                        GOTO(out_free, rc);
-                }
-#else
-                /* 2.4 kernels: if ldiskfs fails, try ext3 */
-                mnt = ll_kern_mount("ext3", s_flags, lmd->lmd_dev, 0);
-                if (IS_ERR(mnt)) {
-                        rc = PTR_ERR(mnt);
-                        CERROR("premount ext3 failed: rc = %d\n", rc);
-                        GOTO(out_free, rc);
-                }
-#endif
+                CERROR("premount %s:%#lx ldiskfs failed: %d "
+                        "Is the ldiskfs module available?\n",
+                        lmd->lmd_dev, s_flags, rc );
+                GOTO(out_free, rc);
         }
 
         OBD_SET_CTXT_MAGIC(&mount_ctxt);
@@ -1345,9 +1438,9 @@ static void server_put_super(struct super_block *sb)
                    If there are any setup/cleanup errors, save the lov
                    name for safety cleanup later. */
                 lprof = class_get_profile(lsi->lsi_ldd->ldd_svname);
-                if (lprof && lprof->lp_osc) {
-                        OBD_ALLOC(extraname, strlen(lprof->lp_osc) + 1);
-                        strcpy(extraname, lprof->lp_osc);
+                if (lprof && lprof->lp_dt) {
+                        OBD_ALLOC(extraname, strlen(lprof->lp_dt) + 1);
+                        strcpy(extraname, lprof->lp_dt);
                 }
 
                 obd = class_name2obd(lsi->lsi_ldd->ldd_svname);
@@ -1365,7 +1458,6 @@ static void server_put_super(struct super_block *sb)
                         CERROR("no obd %s\n", lsi->lsi_ldd->ldd_svname);
                         server_deregister_mount(lsi->lsi_ldd->ldd_svname);
                 }
-
         }
 
         /* If they wanted the mgs to stop separately from the mdt, they
@@ -1408,6 +1500,7 @@ static void server_put_super(struct super_block *sb)
         OBD_FREE(tmpname, tmpname_sz);
         EXIT;
 }
+
 #ifdef HAVE_UMOUNTBEGIN_VFSMOUNT
 static void server_umount_begin(struct vfsmount *vfsmnt, int flags)
 {
@@ -1539,9 +1632,10 @@ static int server_fill_super(struct super_block *sb)
                lsi->lsi_lmd->lmd_dev);
 
         if (class_name2obd(lsi->lsi_ldd->ldd_svname)) {
-                LCONSOLE_ERROR("The target named %s is already running. "
-                               "Double-mount may have compromised the disk "
-                               "journal.\n", lsi->lsi_ldd->ldd_svname);
+                LCONSOLE_ERROR_MSG(0x161, "The target named %s is already "
+                                   "running. Double-mount may have compromised"
+                                   " the disk journal.\n",
+                                   lsi->lsi_ldd->ldd_svname);
                 unlock_mntput(mnt);
                 lustre_put_lsi(sb);
                 GOTO(out, rc = -EALREADY);
@@ -1642,6 +1736,7 @@ int lustre_common_put_super(struct super_block *sb)
         RETURN(rc);
 }
 
+#if 0
 static void lmd_print(struct lustre_mount_data *lmd)
 {
         int i;
@@ -1651,6 +1746,10 @@ static void lmd_print(struct lustre_mount_data *lmd)
                 PRINT_CMD(PRINT_MASK, "profile: %s\n", lmd->lmd_profile);
         PRINT_CMD(PRINT_MASK, "device:  %s\n", lmd->lmd_dev);
         PRINT_CMD(PRINT_MASK, "flags:   %x\n", lmd->lmd_flags);
+        if (lmd->lmd_sec_mdt)
+                PRINT_CMD(PRINT_MASK, "sec_mdt: %s\n", lmd->lmd_sec_mdt);
+        if (lmd->lmd_sec_cli)
+                PRINT_CMD(PRINT_MASK, "sec_cli: %s\n", lmd->lmd_sec_cli);
         if (lmd->lmd_opts)
                 PRINT_CMD(PRINT_MASK, "options: %s\n", lmd->lmd_opts);
         for (i = 0; i < lmd->lmd_exclude_count; i++) {
@@ -1658,6 +1757,7 @@ static void lmd_print(struct lustre_mount_data *lmd)
                           lmd->lmd_exclude[i]);
         }
 }
+#endif
 
 /* Is this server on the exclusion list */
 int lustre_check_exclusion(struct super_block *sb, char *svname)
@@ -1718,7 +1818,6 @@ static int lmd_make_exclusion(struct lustre_mount_data *lmd, char *ptr)
                 s1 = s2;
                 /* now we are pointing at ':' (next exclude)
                    or ',' (end of excludes) */
-
                 if (lmd->lmd_exclude_count >= devmax)
                         break;
         }
@@ -1741,6 +1840,66 @@ static int lmd_make_exclusion(struct lustre_mount_data *lmd, char *ptr)
         RETURN(rc);
 }
 
+static
+int lmd_set_sec_opts(char **set, char *opts, int length)
+{
+        if (*set)
+                OBD_FREE(*set, strlen(*set) + 1);
+
+        OBD_ALLOC(*set, length + 1);
+        if (*set == NULL)
+                return -ENOMEM;
+
+        memcpy(*set, opts, length);
+        (*set)[length] = '\0';
+
+        return 0;
+}
+
+static
+int lmd_parse_sec_opts(struct lustre_mount_data *lmd, char *ptr)
+{
+        char  *tail;
+        char **set = NULL;
+        int    length;
+
+        /* check peer name */
+        if (strncmp(ptr, "sec_mdt=", 8) == 0) {
+                set = &lmd->lmd_sec_mdt;
+                ptr += 8;
+        } else if (strncmp(ptr, "sec_cli=", 8) == 0) {
+                set = &lmd->lmd_sec_cli;
+                ptr += 8;
+        } else if (strncmp(ptr, "sec=", 4) == 0) {
+                /* leave 'set' be null */
+                ptr += 4;
+        } else {
+                CERROR("invalid security options: %s\n", ptr);
+                return -EINVAL;
+        }
+
+        tail = strchr(ptr, ',');
+        if (tail == NULL)
+                length = strlen(ptr);
+        else
+                length = tail - ptr;
+
+        if (set) {
+                if (lmd_set_sec_opts(set, ptr, length))
+                        return -EINVAL;
+        } else {
+                if (lmd->lmd_sec_mdt == NULL &&
+                    lmd_set_sec_opts(&lmd->lmd_sec_mdt, ptr, length))
+                        return -EINVAL;
+
+                if (lmd->lmd_sec_cli == NULL &&
+                    lmd_set_sec_opts(&lmd->lmd_sec_cli, ptr, length))
+                        return -EINVAL;
+        }
+
+        return 0;
+}
+
 /* mount -v -t lustre uml1:uml2:/lustre-client /mnt/lustre */
 static int lmd_parse(char *options, struct lustre_mount_data *lmd)
 {
@@ -1751,16 +1910,16 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
 
         LASSERT(lmd);
         if (!options) {
-                LCONSOLE_ERROR("Missing mount data: check that "
-                               "/sbin/mount.lustre is installed.\n");
+                LCONSOLE_ERROR_MSG(0x162, "Missing mount data: check that "
+                                   "/sbin/mount.lustre is installed.\n");
                 RETURN(-EINVAL);
         }
 
         /* Options should be a string - try to detect old lmd data */
         if ((raw->lmd_magic & 0xffffff00) == (LMD_MAGIC & 0xffffff00)) {
-                LCONSOLE_ERROR("You're using an old version of "
-                               "/sbin/mount.lustre.  Please install version "
-                               "%s\n", LUSTRE_VERSION_STRING);
+                LCONSOLE_ERROR_MSG(0x163, "You're using an old version of "
+                                   "/sbin/mount.lustre.  Please install "
+                                   "version %s\n", LUSTRE_VERSION_STRING);
                 RETURN(-EINVAL);
         }
         lmd->lmd_magic = LMD_MAGIC;
@@ -1791,8 +1950,18 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
                         if (rc)
                                 goto invalid;
                         clear++;
+                } else if (strncmp(s1, "nllu=", 5) == 0) {
+                        lmd->lmd_nllu = simple_strtoul(s1 + 5, NULL, 10);
+                        clear++;
+                } else if (strncmp(s1, "nllg=", 5) == 0) {
+                        lmd->lmd_nllg = simple_strtoul(s1 + 5, NULL, 10);
+                        clear++;
+                } else if (strncmp(s1, "sec", 3) == 0) {
+                        rc = lmd_parse_sec_opts(lmd, s1);
+                        if (rc)
+                                goto invalid;
+                        clear++;
                 }
-
                 /* Linux 2.4 doesn't pass the device, so we stuck it at the
                    end of the options. */
                 else if (strncmp(s1, "device=", 7) == 0) {
@@ -1818,8 +1987,8 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
         }
 
         if (!devname) {
-                LCONSOLE_ERROR("Can't find the device name "
-                               "(need mount option 'device=...')\n");
+                LCONSOLE_ERROR_MSG(0x164, "Can't find the device name "
+                                   "(need mount option 'device=...')\n");
                 goto invalid;
         }
 
@@ -1855,7 +2024,6 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
 
         lmd->lmd_magic = LMD_MAGIC;
 
-        lmd_print(lmd);
         RETURN(rc);
 
 invalid:
@@ -1888,8 +2056,9 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent)
         if (lmd_is_client(lmd)) {
                 CDEBUG(D_MOUNT, "Mounting client %s\n", lmd->lmd_profile);
                 if (!client_fill_super) {
-                        LCONSOLE_ERROR("Nothing registered for client mount!"
-                               " Is the 'lustre' module loaded?\n");
+                        LCONSOLE_ERROR_MSG(0x165, "Nothing registered for "
+                                           "client mount! Is the 'lustre' "
+                                           "module loaded?\n");
                         rc = -ENODEV;
                 } else {
                         rc = lustre_start_mgc(sb);
@@ -1901,7 +2070,6 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent)
                         /* (should always be ll_fill_super) */
                         rc = (*client_fill_super)(sb);
                         /* c_f_s will call lustre_common_put_super on failure */
-
                 }
         } else {
                 CDEBUG(D_MOUNT, "Mounting server from %s\n", lmd->lmd_dev);
@@ -1931,10 +2099,13 @@ void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb))
         client_fill_super = cfs;
 }
 
+void lustre_register_kill_super_cb(void (*cfs)(struct super_block *sb))
+{
+        kill_super_cb = cfs;
+}
+
 /***************** FS registration ******************/
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-/* 2.5 and later */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
 struct super_block * lustre_get_sb(struct file_system_type *fs_type,
                                int flags, const char *devname, void * data)
@@ -1956,35 +2127,23 @@ int lustre_get_sb(struct file_system_type *fs_type,
 }
 #endif
 
-struct file_system_type lustre_fs_type = {
-        .owner        = THIS_MODULE,
-        .name         = "lustre",
-        .get_sb       = lustre_get_sb,
-        .kill_sb      = kill_anon_super,
-        .fs_flags     = FS_BINARY_MOUNTDATA,
-};
-
-#else
-/* 2.4 */
-static struct super_block *lustre_read_super(struct super_block *sb,
-                                             void *data, int silent)
+void lustre_kill_super(struct super_block *sb)
 {
-        int rc;
-        ENTRY;
+        struct lustre_sb_info *lsi = s2lsi(sb);
 
-        rc = lustre_fill_super(sb, data, silent);
-        if (rc)
-                RETURN(NULL);
-        RETURN(sb);
+        if (kill_super_cb && lsi &&(lsi->lsi_flags & LSI_SERVER))
+                (*kill_super_cb)(sb);
+
+        kill_anon_super(sb);
 }
 
-static struct file_system_type lustre_fs_type = {
-        .owner          = THIS_MODULE,
-        .name           = "lustre",
-        .fs_flags       = FS_NFSEXP_FSID,
-        .read_super     = lustre_read_super,
+struct file_system_type lustre_fs_type = {
+        .owner        = THIS_MODULE,
+        .name         = "lustre",
+        .get_sb       = lustre_get_sb,
+        .kill_sb      = lustre_kill_super,
+        .fs_flags     = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV,
 };
-#endif
 
 int lustre_register_fs(void)
 {
@@ -1997,11 +2156,14 @@ int lustre_unregister_fs(void)
 }
 
 EXPORT_SYMBOL(lustre_register_client_fill_super);
+EXPORT_SYMBOL(lustre_register_kill_super_cb);
 EXPORT_SYMBOL(lustre_common_put_super);
 EXPORT_SYMBOL(lustre_process_log);
 EXPORT_SYMBOL(lustre_end_log);
 EXPORT_SYMBOL(server_get_mount);
+EXPORT_SYMBOL(server_get_mount_2);
 EXPORT_SYMBOL(server_put_mount);
+EXPORT_SYMBOL(server_put_mount_2);
 EXPORT_SYMBOL(server_register_target);
 EXPORT_SYMBOL(server_name2index);
 EXPORT_SYMBOL(server_mti_print);