forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

staging/lustre: Remove server defines from lustre_disk.h

Browse source 
Take initial stab at removing server-disk related defines that
client does not need.

Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2015-09-16 12:27:10 -04:00 • committed by Greg Kroah-Hartman
commit f1c4ad3a2e
2 changed files with 0 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

137
drivers/staging/lustre/lustre/include/lustre_disk.h
View file

@ -52,24 +52,6 @@
#include "../../include/linux/lnet/types.h"
#include <linux/backing-dev.h>
/****************** on-disk files *********************/
#define MDT_LOGS_DIR "LOGS" /* COMPAT_146 */
#define MOUNT_CONFIGS_DIR "CONFIGS"
#define CONFIGS_FILE "mountdata"
/** Persistent mount data are stored on the disk in this file. */
#define MOUNT_DATA_FILE MOUNT_CONFIGS_DIR"/"CONFIGS_FILE
#define LAST_RCVD "last_rcvd"
#define LOV_OBJID "lov_objid"
#define LOV_OBJSEQ "lov_objseq"
#define HEALTH_CHECK "health_check"
#define CAPA_KEYS "capa_keys"
#define CHANGELOG_USERS "changelog_users"
#define MGS_NIDTBL_DIR "NIDTBL_VERSIONS"
#define QMT_DIR "quota_master"
#define QSD_DIR "quota_slave"
#define HSM_ACTIONS "hsm_actions"
/****************** persistent mount data *********************/
#define LDD_F_SV_TYPE_MDT 0x0001
@ -79,125 +61,6 @@
LDD_F_SV_TYPE_OST | \
LDD_F_SV_TYPE_MGS)
#define LDD_F_SV_ALL 0x0008
/** need an index assignment */
#define LDD_F_NEED_INDEX 0x0010
/** never registered */
#define LDD_F_VIRGIN 0x0020
/** update the config logs for this server */
#define LDD_F_UPDATE 0x0040
/** rewrite the LDD */
#define LDD_F_REWRITE_LDD 0x0080
/** regenerate config logs for this fs or server */
#define LDD_F_WRITECONF 0x0100
/** COMPAT_14 */
#define LDD_F_UPGRADE14 0x0200
/** process as lctl conf_param */
#define LDD_F_PARAM 0x0400
/** all nodes are specified as service nodes */
#define LDD_F_NO_PRIMNODE 0x1000
/** IR enable flag */
#define LDD_F_IR_CAPABLE 0x2000
/** the MGS refused to register the target. */
#define LDD_F_ERROR 0x4000
/** process at lctl conf_param */
#define LDD_F_PARAM2 0x8000
/* opc for target register */
#define LDD_F_OPC_REG 0x10000000
#define LDD_F_OPC_UNREG 0x20000000
#define LDD_F_OPC_READY 0x40000000
#define LDD_F_OPC_MASK 0xf0000000
#define LDD_F_ONDISK_MASK (LDD_F_SV_TYPE_MASK)
#define LDD_F_MASK 0xFFFF
enum ldd_mount_type {
LDD_MT_EXT3 = 0,
LDD_MT_LDISKFS,
LDD_MT_SMFS,
LDD_MT_REISERFS,
LDD_MT_LDISKFS2,
LDD_MT_ZFS,
LDD_MT_LAST
};
static inline char *mt_str(enum ldd_mount_type mt)
{
static char *mount_type_string[] = {
"ext3",
"ldiskfs",
"smfs",
"reiserfs",
"ldiskfs2",
"zfs",
};
return mount_type_string[mt];
}
static inline char *mt_type(enum ldd_mount_type mt)
{
static char *mount_type_string[] = {
"osd-ldiskfs",
"osd-ldiskfs",
"osd-smfs",
"osd-reiserfs",
"osd-ldiskfs",
"osd-zfs",
};
return mount_type_string[mt];
}
#define LDD_INCOMPAT_SUPP 0
#define LDD_ROCOMPAT_SUPP 0
#define LDD_MAGIC 0x1dd00001
/* 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) */
/*200*/ char ldd_userdata[1024 - 200]; /* arbitrary user string */
/*1024*/__u8 ldd_padding[4096 - 1024];
/*4096*/char ldd_mount_opts[4096]; /* target fs mount opts */
/*8192*/char ldd_params[4096]; /* key=value pairs */
};
#define MT_STR(data) mt_str((data)->ldd_mount_type)
/* Make the mdt/ost server obd name based on the filesystem name */
static inline int server_make_name(__u32 flags, __u16 index, char *fs,
char *name)
{
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_WRITECONF) ? '=' : '-'),
(flags & LDD_F_SV_TYPE_MDT) ? "MDT" : "OST",
index);
} else if (flags & LDD_F_SV_TYPE_MGS) {
sprintf(name, "MGS");
} else {
CERROR("unknown server type %#x\n", flags);
return 1;
}
return 0;
}
/****************** mount command *********************/

8
drivers/staging/lustre/lustre/obdclass/llog_internal.h
View file

@ -71,14 +71,6 @@ static inline struct llog_thread_info *llog_info(const struct lu_env *env)
return lgi;
}
static inline void
lustre_build_llog_lvfs_oid(struct llog_logid *logid, __u64 ino, __u32 gen)
{
ostid_set_seq_llog(&logid->lgl_oi);
ostid_set_id(&logid->lgl_oi, ino);
logid->lgl_ogen = gen;
}
int llog_info_init(void);
void llog_info_fini(void);