X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fuapi%2Flinux%2Flustre%2Flustre_disk.h;h=54f73fdcca9ce77ba2cd680b9202015f7b87fab9;hb=b5ddb7dab5fca41b493212002406034925770942;hp=ab32e0707016c55545d5fcc6106b903dedfe63bb;hpb=6ff16309a006788cc91a7adf561aaebd76dd3b38;p=fs%2Flustre-release.git

diff --git a/lustre/include/uapi/linux/lustre/lustre_disk.h b/lustre/include/uapi/linux/lustre/lustre_disk.h
index ab32e07..54f73fd 100644
--- a/lustre/include/uapi/linux/lustre/lustre_disk.h
+++ b/lustre/include/uapi/linux/lustre/lustre_disk.h
@@ -27,9 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * uapi/linux/lustre_disk.h
  *
  * Lustre disk format definitions.
  *
@@ -62,6 +59,8 @@
 #define MGS_NIDTBL_DIR		"NIDTBL_VERSIONS"
 #define QMT_DIR			"quota_master"
 #define QSD_DIR			"quota_slave"
+#define QSD_DIR_DT		"quota_slave_dt"
+#define QSD_DIR_MD		"quota_slave_md"
 #define HSM_ACTIONS		"hsm_actions"
 #define LFSCK_DIR		"LFSCK"
 #define LFSCK_BOOKMARK		"lfsck_bookmark"
@@ -69,6 +68,32 @@
 #define LFSCK_NAMESPACE		"lfsck_namespace"
 #define REMOTE_PARENT_DIR	"REMOTE_PARENT_DIR"
 #define INDEX_BACKUP_DIR	"index_backup"
+#define MDT_ORPHAN_DIR		"PENDING"
+
+/* On-disk configuration file. In host-endian order. */
+struct lustre_disk_data {
+	__u32 ldd_magic;
+	__u32 ldd_feature_compat;	/* compatible feature flags */
+	__u32 ldd_feature_rocompat;	/* read-only compatible feature flags */
+	__u32 ldd_feature_incompat;	/* incompatible feature flags */
+
+	__u32 ldd_config_ver;		/* config rewrite count - not used */
+	__u32 ldd_flags;		/* LDD_SV_TYPE */
+	__u32 ldd_svindex;		/* server index (0001), must match
+					 * svname
+					 */
+	__u32 ldd_mount_type;		/* target fs type LDD_MT_* */
+	char  ldd_fsname[64];		/* filesystem this server is part of,
+					 * MTI_NAME_MAXLEN
+					 */
+	char  ldd_svname[64];		/* this server's name (lustre-mdt0001)*/
+	__u8  ldd_uuid[40];		/* server UUID (COMPAT_146) */
+
+	char  ldd_userdata[1024 - 200];	/* arbitrary user string '200' */
+	__u8  ldd_padding[4096 - 1024];	/* 1024 */
+	char  ldd_mount_opts[4096];	/* target fs mount opts '4096' */
+	char  ldd_params[4096];		/* key=value pairs '8192' */
+};
 
 /****************** persistent mount data *********************/
 
@@ -90,7 +115,7 @@
 /** regenerate config logs for this fs or server */
 #define LDD_F_WRITECONF		0x0100
 /** COMPAT_14 */
-#define LDD_F_UPGRADE14		0x0200
+/*#define LDD_F_UPGRADE14		0x0200 deprecated since 1.8 */
 /** process as lctl conf_param */
 #define LDD_F_PARAM		0x0400
 /** all nodes are specified as service nodes */
@@ -101,6 +126,8 @@
 #define LDD_F_ERROR		0x4000
 /** process at lctl conf_param */
 #define LDD_F_PARAM2		0x8000
+/** the target shouldn't use local logs */
+#define LDD_F_NO_LOCAL_LOGS	0x10000
 
 #define LDD_MAGIC 0x1dd00001