X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Fobd.h;h=8474b78cf53c38657c415b3d122b405c14750838;hb=6aea6cf0aecb1f819bb8a0e9cf546d26b653e2b4;hp=f48f6080e67197ce429d43552e42d59d5a02a7ca;hpb=c4d1747ce0ac52d95cccca84aae4d9bcceca2b88;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h index f48f608..8474b78 100644 --- a/lustre/include/linux/obd.h +++ b/lustre/include/linux/obd.h @@ -12,13 +12,11 @@ #include #include #include +#include +#include #include -struct obd_conn_info { - unsigned int conn_id; /* handle */ -}; - struct obd_type { struct list_head typ_chain; struct obd_ops *typ_ops; @@ -26,25 +24,13 @@ struct obd_type { int typ_refcnt; }; -struct obd_run_ctxt { - struct vfsmount *pwdmnt; - struct dentry *pwd; - mm_segment_t fs; -}; - -struct obd_conn { - struct obd_device *oc_dev; - uint32_t oc_id; +struct brw_page { + struct page *pg; + obd_size count; + obd_off off; + obd_flag flag; }; -struct obd_devicename { - uint32_t len; - char *name; - struct dentry *dentry; /* file system obd device names */ - __u8 _uuid[16]; /* uuid obd device names */ -}; - - /* Individual type definitions */ struct ext2_obd { @@ -52,11 +38,30 @@ struct ext2_obd { struct vfsmount *e2_vfsmnt; }; +#define OBD_RUN_CTXT_MAGIC 0xC0FFEEAA +#define OBD_CTXT_DEBUG /* development-only debugging */ +struct obd_run_ctxt { + struct vfsmount *pwdmnt; + struct dentry *pwd; + mm_segment_t fs; +#ifdef OBD_CTXT_DEBUG + __u32 magic; +#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; struct vfsmount *fo_vfsmnt; struct obd_run_ctxt fo_ctxt; + struct dentry *fo_dentry_O; + struct dentry *fo_dentry_O_mode[16]; spinlock_t fo_lock; __u64 fo_lastino; struct file_operations *fo_fop; @@ -64,27 +69,37 @@ struct filter_obd { struct address_space_operations *fo_aops; }; -struct mds_client_info; struct mds_server_data; +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 ptlrpc_service *mds_service; char *mds_fstype; struct super_block *mds_sb; + struct super_operations *mds_sop; struct vfsmount *mds_vfsmnt; struct obd_run_ctxt mds_ctxt; struct file_operations *mds_fop; 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 mds_client_info *mds_client_info; struct mds_server_data *mds_server_data; }; @@ -112,9 +127,10 @@ struct recovd_obd { 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_connections_lh; /* connections managed by the mgr */ - struct list_head recovd_troubled_lh; /* connections in trouble */ + struct list_head recovd_clients_lh; /* clients managed */ + struct list_head recovd_troubled_lh; /* clients in trouble */ wait_queue_head_t recovd_recovery_waitq; wait_queue_head_t recovd_ctl_waitq; wait_queue_head_t recovd_waitq; @@ -131,114 +147,140 @@ struct snap_obd { int snap_tableno; }; -struct raid1_obd { - unsigned int raid1_count; /* how many replicas */ - /* devices to replicate on */ - struct obd_device *raid1_devlist[MAX_RAID1]; - /* connections we make */ - struct obd_conn_info raid1_connections[MAX_RAID1]; - struct list_head raid1_clients; /* clients we have */ -}; #endif struct ost_obd { struct ptlrpc_service *ost_service; + struct lustre_handle ost_conn; /* the local connection to the OBD */ +}; - struct obd_device *ost_tgt; - struct obd_conn ost_conn; + +struct lov_tgt_desc { + uuid_t uuid; + struct lustre_handle conn; }; -struct osc_obd { - struct obd_device *osc_tgt; - struct ptlrpc_client *osc_client; - struct ptlrpc_client *osc_ldlm_client; - struct ptlrpc_connection *osc_conn; +struct lov_obd { + struct obd_device *mdcobd; + struct lov_desc desc; + int bufsize; + struct lov_tgt_desc *tgts; }; +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 */ -#define MAX_MULTI 16 struct obd_device { struct obd_type *obd_type; + + /* common and UUID name of this device */ char *obd_name; __u8 obd_uuid[37]; int obd_minor; int obd_flags; - int obd_refcnt; - struct obd_devicename obd_fsname; struct proc_dir_entry *obd_proc_entry; - int obd_multi_count; - struct obd_conn obd_multi_conn[MAX_MULTI]; - unsigned int obd_gen_last_id; - unsigned long obd_gen_prealloc_quota; - struct list_head obd_gen_clients; - struct list_head obd_req_list; - wait_queue_head_t obd_req_waitq; + struct list_head obd_exports; + struct list_head obd_imports; + struct ldlm_namespace *obd_namespace; union { struct ext2_obd ext2; struct filter_obd filter; struct mds_obd mds; + 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; struct trace_obd trace; + struct lov_obd lov; #if 0 - struct raid1_obd raid1; struct snap_obd snap; #endif } u; }; +struct io_cb_data; + struct obd_ops { - int (*o_iocontrol)(int cmd, struct obd_conn *, int len, void *karg, - void *uarg); - int (*o_get_info)(struct obd_conn *, obd_count keylen, void *key, + 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 obd_conn *, obd_count keylen, void *key, + int (*o_set_info)(struct lustre_handle *, obd_count keylen, void *key, obd_count vallen, void *val); int (*o_attach)(struct obd_device *dev, obd_count len, void *data); 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 obd_conn *conn); - int (*o_disconnect)(struct obd_conn *conn); - - - int (*o_statfs)(struct obd_conn *conn, struct statfs *statfs); - int (*o_preallocate)(struct obd_conn *, obd_count *req, obd_id *ids); - int (*o_create)(struct obd_conn *conn, struct obdo *oa); - int (*o_destroy)(struct obd_conn *conn, struct obdo *oa); - int (*o_setattr)(struct obd_conn *conn, struct obdo *oa); - int (*o_getattr)(struct obd_conn *conn, struct obdo *oa); - int (*o_open)(struct obd_conn *conn, struct obdo *oa); - int (*o_close)(struct obd_conn *conn, struct obdo *oa); - int (*o_read)(struct obd_conn *conn, struct obdo *oa, char *buf, - obd_size *count, obd_off offset); - int (*o_write)(struct obd_conn *conn, struct obdo *oa, char *buf, - obd_size *count, obd_off offset); - int (*o_brw)(int rw, struct obd_conn *conn, obd_count num_oa, - struct obdo **oa, obd_count *oa_bufs, struct page **buf, - obd_size *count, obd_off *offset, obd_flag *flags); - int (*o_punch)(struct obd_conn *conn, struct obdo *tgt, obd_size count, + 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, + 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 obd_conn *conn, struct obdo *tgt, obd_size count, - obd_off offset); - int (*o_migrate)(struct obd_conn *conn, struct obdo *dst, + 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 obd_conn *dstconn, struct obdo *dst, - struct obd_conn *srconn, struct obdo *src, + 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 obd_conn *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 obd_conn *conn, + int (*o_preprw)(int cmd, struct lustre_handle *conn, int objcount, struct obd_ioobj *obj, - int niocount, struct niobuf *nb, - struct niobuf *res); - int (*o_commitrw)(int cmd, struct obd_conn *conn, + int niocount, struct niobuf_remote *remote, + struct niobuf_local *local, void **desc_private); + int (*o_commitrw)(int cmd, struct lustre_handle *conn, int objcount, struct obd_ioobj *obj, - int niocount, struct niobuf *res); + int niocount, struct niobuf_local *local, + void *desc_private); + 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 *, 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