Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6050 target: control OST-index in IDIF via ROCOMPAT flag
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_disk.h
diff --git
a/lustre/include/lustre_disk.h
b/lustre/include/lustre_disk.h
index
48406b5
..
b0dec84
100644
(file)
--- a/
lustre/include/lustre_disk.h
+++ b/
lustre/include/lustre_disk.h
@@
-27,7
+27,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
3
, Intel Corporation.
+ * Copyright (c) 2011, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-68,6
+68,10
@@
#define QMT_DIR "quota_master"
#define QSD_DIR "quota_slave"
#define HSM_ACTIONS "hsm_actions"
#define QMT_DIR "quota_master"
#define QSD_DIR "quota_slave"
#define HSM_ACTIONS "hsm_actions"
+#define LFSCK_DIR "LFSCK"
+#define LFSCK_BOOKMARK "lfsck_bookmark"
+#define LFSCK_LAYOUT "lfsck_layout"
+#define LFSCK_NAMESPACE "lfsck_namespace"
/****************** persistent mount data *********************/
/****************** persistent mount data *********************/
@@
-98,6
+102,8
@@
#define LDD_F_IR_CAPABLE 0x2000
/** the MGS refused to register the target. */
#define LDD_F_ERROR 0x4000
#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
/* opc for target register */
#define LDD_F_OPC_REG 0x10000000
@@
-206,7
+212,8
@@
static inline int server_make_name(__u32 flags, __u16 index, char *fs,
/* The lmd is only used internally by Lustre; mount simply passes
everything as string options */
/* The lmd is only used internally by Lustre; mount simply passes
everything as string options */
-#define LMD_MAGIC 0xbdacbd03
+#define LMD_MAGIC 0xbdacbd03
+#define LMD_PARAMS_MAXLEN 4096
/* gleaned from the mount command - no persistent info here */
struct lustre_mount_data {
/* gleaned from the mount command - no persistent info here */
struct lustre_mount_data {
@@
-282,7
+289,9
@@
struct lustre_mount_data {
#define OBD_COMPAT_20 0x00000008
/** MDS handles LOV_OBJID file */
#define OBD_COMPAT_20 0x00000008
/** MDS handles LOV_OBJID file */
-#define OBD_ROCOMPAT_LOVOBJID 0x00000001
+#define OBD_ROCOMPAT_LOVOBJID 0x00000001
+/** store OST index in the IDIF */
+#define OBD_ROCOMPAT_IDX_IN_IDIF 0x00000002
/** OST handles group subdirs */
#define OBD_INCOMPAT_GROUPS 0x00000001
/** OST handles group subdirs */
#define OBD_INCOMPAT_GROUPS 0x00000001
@@
-361,7
+370,7
@@
struct lsd_client_data {
static inline void check_lcd(char *obd_name, int index,
struct lsd_client_data *lcd)
{
static inline void check_lcd(char *obd_name, int index,
struct lsd_client_data *lcd)
{
-
in
t length = sizeof(lcd->lcd_uuid);
+
size_
t length = sizeof(lcd->lcd_uuid);
if (strnlen((char*)lcd->lcd_uuid, length) == length) {
lcd->lcd_uuid[length - 1] = '\0';
if (strnlen((char*)lcd->lcd_uuid, length) == length) {
lcd->lcd_uuid[length - 1] = '\0';
@@
-484,21
+493,23
@@
static inline __u64 lcd_last_xid(struct lsd_client_data *lcd)
struct ll_sb_info;
struct lustre_sb_info {
struct ll_sb_info;
struct lustre_sb_info {
-
int lsi_flags;
-
struct obd_device *lsi_mgc; /* mgc obd */
-
struct lustre_mount_data *lsi_lmd; /* mount command info */
-
struct ll_sb_info *lsi_llsbi; /* add'l client sbi info */
+ int lsi_flags;
+ struct obd_device *lsi_mgc; /* mgc obd */
+ struct lustre_mount_data *lsi_lmd; /* mount command info */
+ struct ll_sb_info *lsi_llsbi; /* add'l client sbi info */
struct dt_device *lsi_dt_dev; /* dt device to access disk fs*/
struct dt_device *lsi_dt_dev; /* dt device to access disk fs*/
- struct vfsmount *lsi_srv_mnt; /* the one server mount */
- cfs_atomic_t lsi_mounts; /* references to the srv_mnt */
+ atomic_t lsi_mounts; /* references to the srv_mnt */
char lsi_svname[MTI_NAME_MAXLEN];
char lsi_osd_obdname[64];
char lsi_osd_uuid[64];
struct obd_export *lsi_osd_exp;
char lsi_osd_type[16];
char lsi_fstype[16];
char lsi_svname[MTI_NAME_MAXLEN];
char lsi_osd_obdname[64];
char lsi_osd_uuid[64];
struct obd_export *lsi_osd_exp;
char lsi_osd_type[16];
char lsi_fstype[16];
- struct backing_dev_info lsi_bdi; /* each client mountpoint needs
- own backing_dev_info */
+ struct backing_dev_info lsi_bdi; /* each client mountpoint needs
+ own backing_dev_info */
+ struct list_head lsi_lwp_list;
+ spinlock_t lsi_lwp_lock;
+ unsigned long lsi_lwp_started:1;
};
#define LSI_UMOUNT_FAILOVER 0x00200000
};
#define LSI_UMOUNT_FAILOVER 0x00200000
@@
-516,10
+527,9
@@
struct lustre_sb_info {
/****************** mount lookup info *********************/
struct lustre_mount_info {
/****************** mount lookup info *********************/
struct lustre_mount_info {
- char *lmi_name;
- struct super_block *lmi_sb;
- struct vfsmount *lmi_mnt;
- cfs_list_t lmi_list_chain;
+ char *lmi_name;
+ struct super_block *lmi_sb;
+ struct list_head lmi_list_chain;
};
/****************** prototypes *********************/
};
/****************** prototypes *********************/
@@
-527,9
+537,10
@@
struct lustre_mount_info {
#ifdef __KERNEL__
/* obd_mount.c */
int server_name2fsname(const char *svname, char *fsname, const char **endptr);
#ifdef __KERNEL__
/* obd_mount.c */
int server_name2fsname(const char *svname, char *fsname, const char **endptr);
-int server_name2index(const char *svname, __u32 *idx, const char **endptr);
int server_name2svname(const char *label, char *svname, const char **endptr,
size_t svsize);
int server_name2svname(const char *label, char *svname, const char **endptr,
size_t svsize);
+int server_name_is_ost(const char *svname);
+int target_name2index(const char *svname, __u32 *idx, const char **endptr);
int lustre_put_lsi(struct super_block *sb);
int lustre_start_simple(char *obdname, char *type, char *uuid,
int lustre_put_lsi(struct super_block *sb);
int lustre_start_simple(char *obdname, char *type, char *uuid,
@@
-544,9
+555,7
@@
int lustre_common_put_super(struct super_block *sb);
/* obd_mount_server.c */
int server_fill_super(struct super_block *sb);
struct lustre_mount_info *server_get_mount(const char *name);
/* obd_mount_server.c */
int server_fill_super(struct super_block *sb);
struct lustre_mount_info *server_get_mount(const char *name);
-struct lustre_mount_info *server_get_mount_2(const char *name);
-int server_put_mount(const char *name, struct vfsmount *mnt);
-int server_put_mount_2(const char *name, struct vfsmount *mnt);
+int server_put_mount(const char *name, bool dereg_mnt);
struct mgs_target_info;
int server_mti_print(const char *title, struct mgs_target_info *mti);
void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);
struct mgs_target_info;
int server_mti_print(const char *title, struct mgs_target_info *mti);
void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd);