int typ_refcnt;
};
+#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
};
struct obd_conn {
struct mds_client_info;
struct mds_server_data;
+struct mdc_obd {
+ struct ptlrpc_client *mdc_client;
+ struct ptlrpc_client *mdc_ldlm_client;
+ struct ptlrpc_connection *mdc_conn;
+ __u8 mdc_target_uuid[37];
+};
+
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 */
char *mds_fstype;
struct super_block *mds_sb;
struct ost_obd {
struct ptlrpc_service *ost_service;
-
- struct obd_device *ost_tgt;
- struct obd_conn ost_conn;
+ struct obd_device *ost_tgt; /* the exported OBD */
+ struct obd_conn ost_conn; /* the local connection to the OBD */
};
struct osc_obd {
struct ptlrpc_client *osc_client;
struct ptlrpc_client *osc_ldlm_client;
struct ptlrpc_connection *osc_conn;
+ __u8 osc_target_uuid[37];
};
+typedef __u8 uuid_t[37];
+
+#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];
+
+#if 0
int lov_count;
struct obd_conn *lov_targets;
+#endif
};
/* corresponds to one of the obd's */
-#define MAX_MULTI 16
struct obd_device {
struct obd_type *obd_type;
char *obd_name;
struct ext2_obd ext2;
struct filter_obd filter;
struct mds_obd mds;
+ struct mdc_obd mdc;
struct ost_obd ost;
struct osc_obd osc;
struct ldlm_obd ldlm;
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);
+ obd_size *count, obd_off *offset, obd_flag *flags,
+ void *);
int (*o_punch)(struct obd_conn *conn, struct obdo *tgt, obd_size count,
obd_off offset);
int (*o_sync)(struct obd_conn *conn, struct obdo *tgt, obd_size count,
int objcount, struct obd_ioobj *obj,
int niocount, struct niobuf_local *local,
void *desc_private);
- int (*o_enqueue)(struct obd_conn *conn, struct ldlm_namespace *ns,
- struct ldlm_handle *parent_lock, __u64 *res_id,
- __u32 type, struct ldlm_extent *, __u32 mode,
- int *flags, void *data, int datalen,
- struct ldlm_handle *lockh);
- int (*o_cancel)(struct obd_conn *, __u32 mode, struct ldlm_handle *);
+ int (*o_enqueue)(struct obd_conn *conn,
+ struct lustre_handle *parent_lock, __u64 *res_id,
+ __u32 type, void *cookie, int cookielen, __u32 mode,
+ int *flags, void *cb, void *data, int datalen,
+ struct lustre_handle *lockh);
+ int (*o_cancel)(struct obd_conn *, __u32 mode, struct lustre_handle *);
};
#endif