#include <linux/fs.h>
#include <linux/list.h>
#include <linux/smp_lock.h>
+#include <linux/proc_fs.h>
+#include <linux/lustre_lib.h>
#include <linux/lustre_idl.h>
+#include <linux/lustre_mds.h>
+#include <linux/lustre_export.h>
struct obd_type {
struct list_head typ_chain;
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 */
#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 address_space_operations *fo_aops;
};
-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;
- int mdc_max_mdsize;
- __u8 mdc_target_uuid[37];
-};
-
-struct osc_obd {
- 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 obd_import cl_import;
+ struct semaphore cl_sem;
+ int cl_conn_count;
+ __u8 cl_target_uuid[37]; /* XXX -> lustre_name */
+ 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;
struct mds_fs_operations *mds_fsops;
int mds_max_mdsize;
struct file *mds_rcvd_filp;
+ spinlock_t mds_last_lock;
__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;
};
};
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_phase;
+ __u32 recovd_next_phase;
+ __u32 recovd_flags;
+ struct recovd_data *recovd_current_rd;
+ 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;
- struct task_struct *recovd_thread;
+ struct task_struct *recovd_thread;
};
struct trace_obd {
int obd_minor;
int obd_flags;
struct proc_dir_entry *obd_proc_entry;
- struct list_head obd_exports;
- struct list_head obd_imports;
+ struct list_head obd_exports;
+ struct list_head obd_imports;
struct ldlm_namespace *obd_namespace;
+ struct ptlrpc_client obd_ldlm_client; /* XXX OST/MDS only */
+ /* a spinlock is OK for what we do now, may need a semaphore later */
+ spinlock_t obd_dev_lock;
union {
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;
} u;
};
-typedef void (*brw_callback_t)(void *);
+struct io_cb_data;
struct obd_ops {
int (*o_iocontrol)(long cmd, struct lustre_handle *, int len,
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);
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);
- int (*o_getattr)(struct lustre_handle *conn, struct obdo *oa);
+ 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 page **buf, obd_size *count, obd_off *offset,
- obd_flag *flags, brw_callback_t callback, void * data);
+ 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 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 *);
};
+#if BITS_PER_LONG > 32
+#define LPU64 "%lu"
+#define LPD64 "%ld"
+#define LPX64 "%lx"
+#else
+#define LPU64 "%Lu"
+#define LPD64 "%Ld"
+#define LPX64 "%Lx"
+#endif
+
+static inline void *mds_fs_start(struct mds_obd *mds, struct inode *inode,
+ int op)
+{
+ return mds->mds_fsops->fs_start(inode, op);
+}
+
+static inline int mds_fs_commit(struct mds_obd *mds, struct inode *inode,
+ void *handle)
+{
+ return mds->mds_fsops->fs_commit(inode, handle);
+}
+
+static inline int mds_fs_setattr(struct mds_obd *mds, struct dentry *dentry,
+ void *handle, struct iattr *iattr)
+{
+ int rc;
+ /*
+ * NOTE: we probably don't need to take i_sem here when changing
+ * ATTR_SIZE because the MDS never needs to truncate a file.
+ * The ext2/ext3 code never truncates a directory, and files
+ * stored on the MDS are entirely sparse (no data blocks).
+ * If we do need to get it, we can do it here.
+ */
+ lock_kernel();
+ rc = mds->mds_fsops->fs_setattr(dentry, handle, iattr);
+ unlock_kernel();
+
+ return rc;
+}
+
+static inline int mds_fs_set_md(struct mds_obd *mds, struct inode *inode,
+ void *handle, struct lov_mds_md *md)
+{
+ return mds->mds_fsops->fs_set_md(inode, handle, md);
+}
+
+static inline int mds_fs_get_md(struct mds_obd *mds, struct inode *inode,
+ struct lov_mds_md *md)
+{
+ return mds->mds_fsops->fs_get_md(inode, md);
+}
+
+static inline ssize_t mds_fs_readpage(struct mds_obd *mds, struct file *file,
+ char *buf, size_t count, loff_t *offset)
+{
+ return mds->mds_fsops->fs_readpage(file, buf, count, offset);
+}
+
+/* Set up callback to update mds->mds_last_committed with the current
+ * value of mds->mds_last_recieved when this transaction is on disk.
+ */
+static inline int mds_fs_set_last_rcvd(struct mds_obd *mds, void *handle)
+{
+ return mds->mds_fsops->fs_set_last_rcvd(mds, handle);
+}
+
+/* Enable data journaling on the given file */
+static inline ssize_t mds_fs_journal_data(struct mds_obd *mds,
+ struct file *file)
+{
+ return mds->mds_fsops->fs_journal_data(file);
+}
+
+static inline int mds_fs_statfs(struct mds_obd *mds, struct statfs *sfs)
+{
+ if (mds->mds_fsops->fs_statfs)
+ return mds->mds_fsops->fs_statfs(mds->mds_sb, sfs);
+
+ return vfs_statfs(mds->mds_sb, sfs);
+}
+
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff