LU-1581 mount: kernel do not parse ldd

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

diff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.h
index 3cac2c7..7ccce88 100644 (file)
--- a/lustre/include/lustre_disk.h
+++ b/lustre/include/lustre_disk.h
@@ -183,7 +183,8 @@ static inline int server_make_name(__u32 flags, __u16 index, char *fs,
         if (flags & (LDD_F_SV_TYPE_MDT | LDD_F_SV_TYPE_OST)) {
                 if (!(flags & LDD_F_SV_ALL))
                        sprintf(name, "%.8s%c%s%04x", fs,
-                               (flags & LDD_F_VIRGIN) ? ':' : '-',
+                               (flags & LDD_F_VIRGIN) ? ':' :
+                                       ((flags & LDD_F_WRITECONF) ? '=' : '-'),
                                (flags & LDD_F_SV_TYPE_MDT) ? "MDT" : "OST",
                                index);
         } else if (flags & LDD_F_SV_TYPE_MGS) {
@@ -219,6 +220,7 @@ struct lustre_mount_data {
         char      *lmd_mgssec;        /* sptlrpc flavor to mgs */
         char      *lmd_opts;          /* lustre mount options (as opposed to
                                          _device_ mount options) */
+       char      *lmd_params;        /* lustre params */
         __u32     *lmd_exclude;       /* array of OSTs to ignore */
        char    *lmd_mgs;           /* MGS nid */
        char    *lmd_osd_type;      /* OSD type */
@@ -234,6 +236,10 @@ struct lustre_mount_data {
 #define LMD_FLG_WRITECONF    0x0040  /* Rewrite config log */
 #define LMD_FLG_NOIR         0x0080  /* NO imperative recovery */
 #define LMD_FLG_NOSCRUB             0x0100  /* Do not trigger scrub automatically */
+#define LMD_FLG_MGS         0x0200  /* Also start MGS along with server */
+#define LMD_FLG_IAM         0x0400  /* IAM dir */
+#define LMD_FLG_NO_PRIMNODE  0x0800  /* all nodes are service nodes */
+#define LMD_FLG_VIRGIN      0x1000  /* the service registers first time */
 
 #define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)