X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Fobd.h;h=eccf74f76e5d6059498e5898d1750ae6b04dfdfb;hb=ab77929bfcc771d909fb4ec2639a7f1ac0811e76;hp=aab618d89fe0bd90049bca12b562947048dbb466;hpb=c986869759f4481f8fe4e736d451846469f880ef;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h index aab618d..eccf74f 100644 --- a/lustre/include/linux/obd.h +++ b/lustre/include/linux/obd.h @@ -12,7 +12,9 @@ #include #include #include +#include +#include #include struct obd_type { @@ -22,6 +24,39 @@ struct obd_type { int typ_refcnt; }; +struct brw_page { + struct page *pg; + obd_size count; + obd_off off; + obd_flag flag; +}; + +struct lov_oinfo { /* per-child structure */ + __u64 loi_id; + __u64 loi_size; +}; + +struct lov_stripe_md { + __u32 lmd_magic; + __u32 lmd_easize; /* packed size for MDS of ea */ + __u64 lmd_object_id; /* lov object id */ + __u64 lmd_stripe_offset; /* offset of the stripe */ + __u64 lmd_stripe_size; /* size of the stripe */ + __u32 lmd_stripe_count; /* how many objects are being striped */ + __u32 lmd_stripe_pattern; /* per-lov object stripe pattern */ + struct lov_oinfo lmd_oinfo[0]; +}; + +struct lov_stripe_md_one { + __u32 lmd_magic; + __u32 lmd_easize; /* packed size for MDS of ea */ + __u64 lmd_object_id; /* lov object id */ + __u64 lmd_stripe_offset; /* offset of the stripe */ + __u64 lmd_stripe_size; /* size of the stripe */ + __u32 lmd_stripe_count; /* how many objects are being striped */ + __u32 lmd_stripe_pattern; /* per-lov object stripe pattern */ + struct lov_oinfo lmd_oinfo[1]; +}; /* Individual type definitions */ @@ -41,6 +76,12 @@ struct obd_run_ctxt { #endif }; +#ifdef OBD_CTXT_DEBUG +#define OBD_SET_CTXT_MAGIC(ctxt) (ctxt)->magic = OBD_RUN_CTXT_MAGIC +#else +#define OBD_SET_CTXT_MAGIC(ctxt) do {} while(0) +#endif + struct filter_obd { char *fo_fstype; struct super_block *fo_sb; @@ -55,31 +96,21 @@ struct filter_obd { struct address_space_operations *fo_aops; }; -struct mds_client_info; struct mds_server_data; -struct mdc_obd { - struct lustre_handle mdc_connh; - struct ptlrpc_client *mdc_client; - struct ptlrpc_client *mdc_ldlm_client; - struct ptlrpc_connection *mdc_conn; - __u8 mdc_target_uuid[37]; -}; - -struct osc_obd { - struct lustre_handle osc_connh; - struct ptlrpc_client *osc_client; - struct ptlrpc_client *osc_ldlm_client; - struct ptlrpc_connection *osc_conn; - __u8 osc_target_uuid[37]; +struct client_obd { + struct ptlrpc_client *cl_client; + struct ptlrpc_client *cl_ldlm_client; + struct ptlrpc_connection *cl_conn; + struct lustre_handle cl_exporth; + struct semaphore cl_sem; + int cl_conn_count; + __u8 cl_target_uuid[37]; + int cl_max_mdsize; }; struct mds_obd { - struct ldlm_namespace *mds_local_namespace; struct ptlrpc_service *mds_service; - struct ptlrpc_client *mds_ldlm_client; /* to be an LDLM client */ - struct ptlrpc_connection *mds_ldlm_conn; /* to be an LDLM client */ - struct lustre_handle mds_connh; /* to be one's on DLM client */ char *mds_fstype; struct super_block *mds_sb; @@ -90,13 +121,12 @@ struct mds_obd { struct inode_operations *mds_iop; struct address_space_operations *mds_aops; struct mds_fs_operations *mds_fsops; + int mds_max_mdsize; struct file *mds_rcvd_filp; __u64 mds_last_committed; __u64 mds_last_rcvd; __u64 mds_mount_count; struct ll_fid mds_rootfid; - int mds_client_count; - struct list_head mds_client_info; struct mds_server_data *mds_server_data; }; @@ -121,13 +151,11 @@ struct echo_obd { struct recovd_obd { time_t recovd_waketime; time_t recovd_timeout; - struct ptlrpc_service *recovd_service; - struct ptlrpc_client *recovd_client; - __u32 recovd_flags; - __u32 recovd_wakeup_flag; - spinlock_t recovd_lock; - struct list_head recovd_clients_lh; /* clients managed */ - struct list_head recovd_troubled_lh; /* clients in trouble */ + __u32 recovd_flags; + __u32 recovd_wakeup_flag; + spinlock_t recovd_lock; + struct list_head recovd_managed_items; /* items managed */ + struct list_head recovd_troubled_items; /* items in trouble */ wait_queue_head_t recovd_recovery_waitq; wait_queue_head_t recovd_ctl_waitq; wait_queue_head_t recovd_waitq; @@ -152,21 +180,31 @@ struct ost_obd { }; -typedef __u8 uuid_t[37]; +struct lov_tgt_desc { + uuid_t uuid; + struct lustre_handle conn; +}; -#define MAX_MULTI 16 struct lov_obd { - __u32 lov_default_count; - __u32 lov_default_pattern; - __u32 lov_default_size; - uuid_t lov_service_uuids[MAX_MULTI]; + struct obd_device *mdcobd; + struct lov_desc desc; + int bufsize; + struct lov_tgt_desc *tgts; +}; -#if 0 - int lov_count; - struct lustre_handle *lov_targets; -#endif +struct niobuf_local { + __u64 offset; + __u32 len; + __u32 xid; + __u32 flags; + void *addr; + struct page *page; + void *target_private; + struct dentry *dentry; }; +#define N_LOCAL_TEMP_PAGE 0x00000001 + /* corresponds to one of the obd's */ struct obd_device { struct obd_type *obd_type; @@ -178,11 +216,6 @@ struct obd_device { int obd_minor; int obd_flags; struct proc_dir_entry *obd_proc_entry; - int obd_multi_count; - struct lustre_handle obd_multi_conn[MAX_MULTI]; - unsigned int obd_gen_last_id; - unsigned long obd_gen_prealloc_quota; - // struct obd_device *obd_target; /* for anything that simply layers */ struct list_head obd_exports; struct list_head obd_imports; struct ldlm_namespace *obd_namespace; @@ -190,9 +223,9 @@ struct obd_device { struct ext2_obd ext2; struct filter_obd filter; struct mds_obd mds; - struct mdc_obd mdc; + struct client_obd cli; struct ost_obd ost; - struct osc_obd osc; + // struct osc_obd osc; struct ldlm_obd ldlm; struct echo_obd echo; struct recovd_obd recovd; @@ -204,9 +237,11 @@ struct obd_device { } u; }; +struct io_cb_data; + struct obd_ops { - int (*o_iocontrol)(long cmd, struct lustre_handle *, int len, void *karg, - void *uarg); + int (*o_iocontrol)(long cmd, struct lustre_handle *, int len, + void *karg, void *uarg); int (*o_get_info)(struct lustre_handle *, obd_count keylen, void *key, obd_count *vallen, void **val); int (*o_set_info)(struct lustre_handle *, obd_count keylen, void *key, @@ -215,32 +250,42 @@ struct obd_ops { int (*o_detach)(struct obd_device *dev); int (*o_setup) (struct obd_device *dev, obd_count len, void *data); int (*o_cleanup)(struct obd_device *dev); - int (*o_connect)(struct lustre_handle *conn, struct obd_device *src); + int (*o_connect)(struct lustre_handle *conn, struct obd_device *src, + char *cluuid); int (*o_disconnect)(struct lustre_handle *conn); int (*o_statfs)(struct lustre_handle *conn, struct statfs *statfs); - int (*o_preallocate)(struct lustre_handle *, obd_count *req, obd_id *ids); - int (*o_create)(struct lustre_handle *conn, struct obdo *oa); - int (*o_destroy)(struct lustre_handle *conn, struct obdo *oa); - int (*o_setattr)(struct lustre_handle *conn, struct obdo *oa); - int (*o_getattr)(struct lustre_handle *conn, struct obdo *oa); - int (*o_open)(struct lustre_handle *conn, struct obdo *oa); - int (*o_close)(struct lustre_handle *conn, struct obdo *oa); - int (*o_brw)(int rw, struct lustre_handle *conn, obd_count num_oa, - struct obdo **oa, obd_count *oa_bufs, struct page **buf, - obd_size *count, obd_off *offset, obd_flag *flags, - void *); - int (*o_punch)(struct lustre_handle *conn, struct obdo *tgt, obd_size count, + int (*o_preallocate)(struct lustre_handle *, obd_count *req, + obd_id *ids); + int (*o_create)(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md **ea); + int (*o_destroy)(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md *ea); + int (*o_setattr)(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md *ea); + int (*o_getattr)(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md *ea); + int (*o_open)(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md *); + int (*o_close)(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md *); + int (*o_brw)(int rw, struct lustre_handle *conn, + struct lov_stripe_md *md, obd_count oa_bufs, + struct brw_page *pgarr, brw_callback_t callback, + struct io_cb_data *data); + int (*o_punch)(struct lustre_handle *conn, struct obdo *tgt, + struct lov_stripe_md *md, obd_size count, obd_off offset); - int (*o_sync)(struct lustre_handle *conn, struct obdo *tgt, obd_size count, - obd_off offset); + int (*o_sync)(struct lustre_handle *conn, struct obdo *tgt, + obd_size count, obd_off offset); int (*o_migrate)(struct lustre_handle *conn, struct obdo *dst, struct obdo *src, obd_size count, obd_off offset); int (*o_copy)(struct lustre_handle *dstconn, struct obdo *dst, struct lustre_handle *srconn, struct obdo *src, obd_size count, obd_off offset); - int (*o_iterate)(struct lustre_handle *conn, int (*)(obd_id, obd_gr, void *), + int (*o_iterate)(struct lustre_handle *conn, + int (*)(obd_id, obd_gr, void *), obd_id *startid, obd_gr group, void *data); int (*o_preprw)(int cmd, struct lustre_handle *conn, int objcount, struct obd_ioobj *obj, @@ -250,12 +295,17 @@ struct obd_ops { int objcount, struct obd_ioobj *obj, int niocount, struct niobuf_local *local, void *desc_private); - int (*o_enqueue)(struct lustre_handle *conn, - struct lustre_handle *parent_lock, __u64 *res_id, + int (*o_enqueue)(struct lustre_handle *conn, struct lov_stripe_md *md, + struct lustre_handle *parent_lock, __u32 type, void *cookie, int cookielen, __u32 mode, int *flags, void *cb, void *data, int datalen, struct lustre_handle *lockh); - int (*o_cancel)(struct lustre_handle *, __u32 mode, struct lustre_handle *); + int (*o_cancel)(struct lustre_handle *, struct lov_stripe_md *md, __u32 mode, struct lustre_handle *); }; +/* FIXME: for 64-bit arch */ +#define LPU64 "%Lu" +#define LPD64 "%Ld" +#define LPX64 "%Lx" + #endif