#define IOC_MDC_TYPE 'i'
#define IOC_MDC_MIN_NR 20
#define IOC_MDC_LOOKUP _IOWR(IOC_MDC_TYPE, 20, struct obd_device *)
-#define IOC_MDC_GETSTRIPE _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *)
+/* Moved to lustre_user.h
+#define IOC_MDC_GETSTRIPE _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *) */
+#define IOC_MDC_FINISH_GNS _IOWR(IOC_MDC_TYPE, 22, struct obd_device *)
#define IOC_MDC_MAX_NR 50
#ifdef __KERNEL__
# include <linux/mount.h>
#endif
+#include <linux/lvfs.h>
#include <linux/lustre_lib.h>
#include <linux/lustre_idl.h>
#include <linux/lustre_export.h>
struct obd_type {
struct list_head typ_chain;
struct obd_ops *typ_ops;
+ struct md_ops *typ_md_ops;
struct proc_dir_entry *typ_procroot;
char *typ_name;
int typ_refcnt;
unsigned long oh_buckets[OBD_HIST_MAX];
};
-/* Individual type definitions */
-
struct ost_server_data;
+#define FILTER_SUBDIR_COUNT 32 /* set to zero for no subdirs */
+
+#define FILTER_GROUP_LLOG 1
+#define FILTER_GROUP_ECHO 2
+#define FILTER_GROUP_FIRST_MDS 3
+
+struct filter_subdirs {
+ struct dentry *dentry[FILTER_SUBDIR_COUNT];
+};
+
+struct filter_group_llog {
+ struct list_head list;
+ int group;
+ struct obd_llogs *llogs;
+};
+
struct filter_obd {
const char *fo_fstype;
struct super_block *fo_sb;
struct vfsmount *fo_vfsmnt;
- struct dentry *fo_dentry_O;
- struct dentry **fo_dentry_O_groups;
- struct dentry **fo_dentry_O_sub;
+
+ int fo_group_count;
+ struct dentry *fo_dentry_O; /* the "O"bject directory dentry */
+ struct dentry **fo_groups; /* dentries for each group dir */
+ struct filter_subdirs *fo_subdirs; /* subdir array per group */
+ __u64 *fo_last_objids; // per-group last created objid
+ struct file **fo_last_objid_files;
+
spinlock_t fo_objidlock; /* protect fo_lastobjid increment */
spinlock_t fo_translock; /* protect fsd_last_rcvd increment */
struct file *fo_rcvd_filp;
unsigned long *fo_last_rcvd_slots;
__u64 fo_mount_count;
+ unsigned int fo_destroy_in_progress:1;
+ struct semaphore fo_create_lock;
+
struct file_operations *fo_fop;
struct inode_operations *fo_iop;
struct address_space_operations *fo_aops;
struct obd_import *fo_mdc_imp;
struct obd_uuid fo_mdc_uuid;
struct lustre_handle fo_mdc_conn;
-#if 0
- struct ptlrpc_client fo_mdc_client;
-#endif
- struct file **fo_last_objid_files;
- __u64 *fo_last_objids; /* last created objid for groups */
struct semaphore fo_alloc_lock;
struct obd_histogram fo_w_discont_pages;
struct obd_histogram fo_r_discont_blocks;
struct obd_histogram fo_w_discont_blocks;
+
+ struct list_head fo_llog_list;
+ spinlock_t fo_llog_list_lock;
};
struct mds_server_data;
struct dentry *mds_logs_dir;
struct dentry *mds_objects_dir;
struct llog_handle *mds_cfg_llh;
-// struct llog_handle *mds_catalog;
+// struct llog_handle *mds_catalog;
struct obd_device *mds_osc_obd; /* XXX lov_obd */
struct obd_uuid mds_lov_uuid;
char *mds_profile;
struct file *mds_lov_objid_filp;
unsigned long *mds_client_bitmap;
struct semaphore mds_orphan_recovery_sem;
-
+ /*add mds num here for real mds and cache mds create
+ FIXME later will be totally fixed by b_cmd*/
+ int mds_num;
atomic_t mds_open_count;
+
+ char *mds_lmv_name;
+ struct obd_device *mds_lmv_obd; /* XXX lmv_obd */
+ struct obd_export *mds_lmv_exp; /* XXX lov_exp */
+ struct ptlrpc_service *mds_create_service;
+ atomic_t mds_real_clients;
+ struct obd_uuid mds_lmv_uuid;
+ struct dentry *mds_fids_dir;
};
struct echo_obd {
};
struct cache_obd {
- struct obd_export *cobd_target_exp;/* local connection to target obd */
+ struct obd_export *cobd_real_exp;/* local connection to target obd */
struct obd_export *cobd_cache_exp; /* local connection to cache obd */
+ int refcount;
+ int cache_on;
};
struct lov_tgt_desc {
struct lov_tgt_desc *tgts;
};
+struct lmv_tgt_desc {
+ struct obd_uuid uuid;
+ struct obd_export *ltd_exp;
+ int active; /* is this target up for requests */
+};
+
+struct lmv_obd {
+ spinlock_t lmv_lock;
+ struct lmv_desc desc;
+ int bufsize;
+ int refcount;
+ struct lmv_tgt_desc *tgts;
+ struct obd_uuid cluuid;
+ struct obd_export *exp;
+ int connected;
+ int max_easize;
+ int max_cookiesize;
+ int server_timeout;
+};
+
struct niobuf_local {
__u64 offset;
__u32 len;
int rc;
};
+struct cache_manager_obd {
+ struct obd_device *cm_master_obd; /* master lov */
+ struct obd_export *cm_master_exp;
+ struct obd_device *cm_cache_obd; /* cache obdfilter */
+ struct obd_export *cm_cache_exp;
+ int cm_master_group; /* master group*/
+ struct cmobd_write_service *cm_write_srv;
+};
+
/* Don't conflict with on-wire flags OBD_BRW_WRITE, etc */
#define N_LOCAL_TEMP_PAGE 0x10000000
LLOG_RD1_REPL_CTXT = 9,
LLOG_TEST_ORIG_CTXT = 10,
LLOG_TEST_REPL_CTXT = 11,
+ LLOG_REINT_ORIG_CTXT = 12,
LLOG_MAX_CTXTS
};
+struct obd_llogs {
+ struct llog_ctxt *llog_ctxt[LLOG_MAX_CTXTS];
+};
/* corresponds to one of the obd's */
struct obd_device {
struct obd_uuid obd_uuid;
int obd_minor;
- int obd_attached:1, obd_set_up:1, obd_recovering:1,
- obd_abort_recovery:1, obd_replayable:1, obd_no_transno:1,
- obd_no_recov:1, obd_stopping:1;
+ unsigned int obd_attached:1, obd_set_up:1, obd_recovering:1,
+ obd_abort_recovery:1, obd_replayable:1, obd_no_transno:1,
+ obd_no_recov:1, obd_stopping:1;
atomic_t obd_refcount;
wait_queue_head_t obd_refcount_waitq;
struct proc_dir_entry *obd_proc_entry;
spinlock_t obd_osfs_lock;
struct obd_statfs obd_osfs;
unsigned long obd_osfs_age;
- struct obd_run_ctxt obd_ctxt;
+ struct lvfs_run_ctxt obd_lvfs_ctxt;
+ struct obd_llogs obd_llogs;
struct llog_ctxt *obd_llog_ctxt[LLOG_MAX_CTXTS];
struct obd_device *obd_observer;
struct obd_export *obd_self_export;
struct cache_obd cobd;
struct ptlbd_obd ptlbd;
struct mgmtcli_obd mgmtcli;
+ struct lmv_obd lmv;
+ struct cache_manager_obd cmobd;
} u;
/* Fields used by LProcFS */
unsigned int obd_cntr_base;
#define OBD_OPT_FORCE 0x0001
#define OBD_OPT_FAILOVER 0x0002
+#define OBD_OPT_REAL_CLIENT 0x0004
#define OBD_LLOG_FL_SENDNOW 0x0001
+struct mdc_op_data;
+
struct obd_ops {
struct module *o_owner;
int (*o_iocontrol)(unsigned int cmd, struct obd_export *exp, int len,
int objcount, struct obd_ioobj *obj,
int niocount, struct niobuf_local *local,
struct obd_trans_info *oti, int rc);
+ int (*o_write_extents)(struct obd_export *exp, struct obd_ioobj *obj,
+ int niocount, struct niobuf_local *local,int rc);
int (*o_enqueue)(struct obd_export *, struct lov_stripe_md *,
__u32 type, ldlm_policy_data_t *, __u32 mode,
int *flags, void *bl_cb, void *cp_cb, void *gl_cb,
int (*o_destroy_export)(struct obd_export *exp);
/* llog related obd_methods */
- int (*o_llog_init)(struct obd_device *obd, struct obd_device *disk_obd,
- int count, struct llog_catid *logid);
- int (*o_llog_finish)(struct obd_device *obd, int count);
+ int (*o_llog_init)(struct obd_device *, struct obd_llogs *,
+ struct obd_device *, int, struct llog_catid *);
+ int (*o_llog_finish)(struct obd_device *, struct obd_llogs *, int);
+ int (*o_llog_connect)(struct obd_device *, struct llogd_conn_body *);
+
/* metadata-only methods */
int (*o_pin)(struct obd_export *, obd_id ino, __u32 gen, int type,
struct obd_client_handle *, int flag);
int (*o_notify)(struct obd_device *obd, struct obd_device *watched,
int active);
+ int (*o_init_ea_size)(struct obd_export *, int, int);
+
/*
* NOTE: If adding ops, add another LPROCFS_OBD_OP_INIT() line
* to lprocfs_alloc_obd_stats() in obdclass/lprocfs_status.c.
*/
};
+struct ll_uctxt;
+
+struct md_ops {
+ int (*m_getstatus)(struct obd_export *, struct ll_fid *);
+ int (*m_change_cbdata)(struct obd_export *, struct ll_fid *,
+ ldlm_iterator_t, void *);
+ int (*m_change_cbdata_name)(struct obd_export *, struct ll_fid *,
+ char *, int, struct ll_fid *,
+ ldlm_iterator_t, void *);
+ int (*m_close)(struct obd_export *, struct obdo *,
+ struct obd_client_handle *,
+ struct ptlrpc_request **);
+ int (*m_create)(struct obd_export *, struct mdc_op_data *,
+ const void *, int, int, __u32, __u32,
+ __u64, struct ptlrpc_request **);
+ int (*m_done_writing)(struct obd_export *, struct obdo *);
+ int (*m_enqueue)(struct obd_export *, int, struct lookup_intent *,
+ int, struct mdc_op_data *, struct lustre_handle *,
+ void *, int, ldlm_completion_callback,
+ ldlm_blocking_callback, void *);
+ int (*m_getattr)(struct obd_export *, struct ll_fid *,
+ unsigned long, unsigned int,
+ struct ptlrpc_request **);
+ int (*m_getattr_name)(struct obd_export *, struct ll_fid *,
+ char *, int, unsigned long,
+ unsigned int, struct ptlrpc_request **);
+ int (*m_intent_lock)(struct obd_export *, struct ll_uctxt *,
+ struct ll_fid *, const char *, int,
+ void *, int, struct ll_fid *,
+ struct lookup_intent *, int,
+ struct ptlrpc_request **,
+ ldlm_blocking_callback);
+ int (*m_link)(struct obd_export *, struct mdc_op_data *,
+ struct ptlrpc_request **);
+ int (*m_rename)(struct obd_export *, struct mdc_op_data *,
+ const char *, int, const char *, int,
+ struct ptlrpc_request **);
+ int (*m_setattr)(struct obd_export *, struct mdc_op_data *,
+ struct iattr *, void *, int , void *, int,
+ struct ptlrpc_request **);
+ int (*m_sync)(struct obd_export *, struct ll_fid *,
+ struct ptlrpc_request **);
+ int (*m_readpage)(struct obd_export *, struct ll_fid *,
+ __u64, struct page *, struct ptlrpc_request **);
+ int (*m_unlink)(struct obd_export *, struct mdc_op_data *,
+ struct ptlrpc_request **);
+ int (*m_valid_attrs)(struct obd_export *, struct ll_fid *);
+ struct obd_device * (*m_get_real_obd)(struct obd_export *,
+ char *name, int len);
+
+ int (*m_req2lustre_md)(struct obd_export *exp,
+ struct ptlrpc_request *req, unsigned int offset,
+ struct obd_export *osc_exp, struct lustre_md *md);
+ int (*m_set_open_replay_data)(struct obd_export *exp,
+ struct obd_client_handle *och,
+ struct ptlrpc_request *open_req);
+ int (*m_clear_open_replay_data)(struct obd_export *exp,
+ struct obd_client_handle *och);
+ int (*m_store_inode_generation)(struct obd_export *exp,
+ struct ptlrpc_request *req, int reqoff,
+ int repoff);
+ int (*m_set_lock_data)(struct obd_export *exp, __u64 *l, void *data);
+
+ /*
+ * NOTE: If adding ops, add another LPROCFS_OBD_OP_INIT() line
+ * to lprocfs_alloc_obd_stats() in obdclass/lprocfs_status.c.
+ * Also, add a wrapper function in include/linux/obd_class.h.
+ */
+};
static inline void obd_transno_commit_cb(struct obd_device *obd, __u64 transno,
int error)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff