#include <linux/obd_rpc.h>
-#define OBD_PSDEV_MAJOR 120
+#define OBD_PSDEV_MAJOR 186
#define MAX_OBD_DEVICES 8
#define MAX_MULTI 16
-typedef unsigned long objid;
-typedef struct inode obdattr;
-#if 0
-struct obdattr {
- objid oa_id;
- umode_t oa_mode;
- nlink_t oa_nlink;
- uid_t oa_uid;
- gid_t oa_gid;
- off_t oa_size;
- time_t oa_atime;
- time_t oa_mtime;
- time_t oa_ctime;
- unsigned long oa_blksize;
- unsigned long oa_blocks;
- char oa_data[116];
- struct obd_ops *oa_op;
+typedef uint64_t obd_id;
+typedef uint64_t obd_time;
+typedef uint64_t obd_size;
+typedef uint64_t obd_off;
+typedef uint64_t obd_blocks;
+typedef uint32_t obd_blksize;
+typedef uint32_t obd_mode;
+typedef uint32_t obd_uid;
+typedef uint32_t obd_gid;
+typedef uint32_t obd_flag;
+typedef uint32_t obd_count;
+
+#define OBD_INLINESZ 60
+#define OBD_OBDMDSZ 60
+
+#define OBD_FL_INLINEDATA (1UL)
+#define OBD_FL_OBDMDEXISTS (1UL << 1)
+
+/* Note: 64-bit types are 64-bit aligned in structure */
+struct obdo {
+ obd_id o_id;
+ obd_time o_atime;
+ obd_time o_mtime;
+ obd_time o_ctime;
+ obd_size o_size;
+ obd_blocks o_blocks;
+ obd_blksize o_blksize;
+ obd_mode o_mode;
+ obd_uid o_uid;
+ obd_gid o_gid;
+ obd_flag o_flags;
+ obd_flag o_obdflags;
+ obd_count o_nlink;
+ obd_flag o_valid; /* hot fields in this obdo */
+ char *o_inline;
+ char *o_obdmd;
+ struct list_head o_list;
+ struct obd_ops *o_op;
+};
+
+
+static inline int obdo_has_inline(struct obdo *obdo)
+{
+ return obdo->o_obdflags & OBD_FL_INLINEDATA;
+};
+
+static inline int obdo_has_obdmd(struct obdo *obdo)
+{
+ return obdo->o_obdflags & OBD_FL_OBDMDEXISTS;
};
-#endif
extern struct obd_device obd_dev[MAX_OBD_DEVICES];
};
struct obd_ops {
- int (*o_attach)(struct obd_device *, int len, void *);
+ 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, obd_count *vallen, void **val);
+ int (*o_set_info)(struct obd_conn *, obd_count keylen, void *key, obd_count vallen, void *val);
+ int (*o_attach)(struct obd_device *, obd_count len, void *);
int (*o_detach)(struct obd_device *);
- int (*o_format)(struct obd_device *, int len, void *);
- int (*o_partition)(struct obd_device *, int len, void *);
+ 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 *);
- int (*o_setup) (struct obd_device *dev, int len, void *data);
- int (*o_cleanup)(struct obd_device *dev);
- int (*o_setattr)(struct obd_conn *, obdattr *oa);
- int (*o_getattr)(struct obd_conn *, obdattr *oa);
int (*o_statfs)(struct obd_conn *, struct statfs *statfs);
- int (*o_create)(struct obd_conn *, int prealloc_ino, int *er);
- int (*o_destroy)(struct obd_conn *, obdattr *oa);
- int (*o_read)(struct obd_conn *, obdattr *ino, char *buf, unsigned long *count, loff_t offset);
- int (*o_read2)(struct obd_conn *, obdattr *oa, char *buf, unsigned long *count, loff_t offset);
- int (*o_write)(struct obd_conn *, obdattr *oa, char *buf, unsigned long *count, loff_t offset);
- int (*o_brw)(int rw, struct obd_conn * conn, obdattr *obj, struct page *page, int create);
- int (*o_preallocate)(struct obd_conn *, unsigned long *req, long inodes[32]);
- int (*o_get_info)(struct obd_conn *, int keylen, void *key, int *vallen, void **val);
- int (*o_set_info)(struct obd_conn *, int keylen, void *key, int vallen, void *val);
- int (*o_migrate)(struct obd_conn *, obdattr *src, obdattr *dst);
- int (*o_copy)(struct obd_conn *dev, obdattr *source, obdattr *target);
- int (*o_iocontrol)(int cmd, struct obd_conn *, int len, void *karg, void *uarg);
- int (*o_iterate)(struct obd_conn *, int (*)(objid, void *), objid, void *);
+ int (*o_preallocate)(struct obd_conn *, obd_count *req, obd_id *ids);
+ int (*o_create)(struct obd_conn *, struct obdo *oa);
+ int (*o_destroy)(struct obd_conn *, struct obdo *oa);
+ int (*o_setattr)(struct obd_conn *, struct obdo *oa);
+ int (*o_getattr)(struct obd_conn *, struct obdo *oa);
+ int (*o_read)(struct obd_conn *, struct obdo *oa, char *buf, obd_size *count, obd_off offset);
+ int (*o_write)(struct obd_conn *, struct obdo *oa, char *buf, obd_size *count, obd_off offset);
+ int (*o_brw)(int rw, struct obd_conn * conn, struct obdo *oa, char *buf, obd_size *count, obd_off offset, obd_flag flags);
+ int (*o_punch)(struct obd_conn *, struct obdo *tgt, obd_size count, obd_off offset);
+ int (*o_migrate)(struct obd_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, obd_size count, obd_off offset);
+ int (*o_iterate)(struct obd_conn *, int (*)(objid, void *), obd_id start, void *);
};
-#define OBP(dev,op) dev->obd_type->typ_ops->o_ ## op
+#define OBT(dev) dev->obd_type->typ_ops
+#define OBP(dev,op) dev->obd_type->typ_ops->o_ ## op
int obd_register_type(struct obd_ops *ops, char *nm);
int obd_unregister_type(char *nm);
};
/* generic operations shared by various OBD types */
+int gen_multi_setup(struct obd_device *obddev, uint32_t len, void *data);
+int gen_multi_cleanup(struct obd_device *obddev);
+int gen_multi_attach(struct obd_device *obddev, uint32_t len, void *data);
+int gen_multi_detach(struct obd_device *obddev);
int gen_connect (struct obd_conn *conn);
int gen_disconnect(struct obd_conn *conn);
-int gen_multi_setup(struct obd_device *obddev, int len, void *data);
-int gen_multi_cleanup(struct obd_device *obddev);
-int gen_multi_attach(struct obd_device *obddev, int len, void *data);
struct obd_client *gen_client(struct obd_conn *);
-int gen_multi_detach(struct obd_device *obddev);
int gen_cleanup(struct obd_device *obddev);
-int gen_copy_data(struct obd_conn *, obdattr *source, obdattr *target);
+int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst,
+ struct obd_conn *src_conn, struct obdo *src);
struct ioc_mv_s {
unsigned int conn_id;
objid src;
- objid tgt;
+ objid dst;
};
struct oic_rw_s {
/* support routines */
-static __inline__ obdattr *obd_empty_oa(void)
+static __inline__ struct obdo *obd_empty_oa(void)
{
- obdattr *res = NULL;
- OBD_ALLOC(res, obdattr *, sizeof(*res));
+ struct obdo *res = NULL;
+
+ /* XXX we should probably use a slab cache here */
+ OBD_ALLOC(res, struct obdo *, sizeof(*res));
memset(res, 0, sizeof (*res));
+
return res;
}
-static __inline__ void obd_free_oa(obdattr *oa)
+static __inline__ void obd_free_oa(struct obdo *oa)
{
if ( !oa )
return;
- OBD_FREE(oa,sizeof(*oa));
+ OBD_FREE(oa, sizeof(*oa));
}
-static __inline__ obdattr *obd_oa_fromid(struct obd_conn *conn, objid id)
+static __inline__ struct obdo *obd_oa_fromid(struct obd_conn *conn, obd_id id)
{
- obdattr *res = NULL;
+ struct obdo *res = NULL;
- OBD_ALLOC(res, obdattr *, sizeof(*res));
+ OBD_ALLOC(res, struct obdo *, sizeof(*res));
if ( !res ) {
EXIT;
return NULL;
}
memset(res, 0, sizeof(*res));
- res->i_ino = id;
- if (conn->oc_dev->obd_type->typ_ops->o_getattr(conn, res)) {
+ res->o_id = id;
+ if (OBD(conn->oc_dev, getattr)(conn, res)) {
OBD_FREE(res, sizeof(*res));
EXIT;
return NULL;
return res;
}
-#define OBD_MD_NO (1UL) /* negates meaning of all flags */
-#define OBD_MD_ALL (OBD_MD_NO) /* passing NO with no other flags == ALL */
-#define OBD_MD_FLMODE (1UL<<1)
-#define OBD_MD_FLUID (1UL<<2)
-#define OBD_MD_FLGID (1UL<<3)
+#define OBD_MD_FLALL (~0UL)
+#define OBD_MD_FLID (1UL)
+#define OBD_MD_FLATIME (1UL<<1)
+#define OBD_MD_FLMTIME (1UL<<2)
+#define OBD_MD_FLCTIME (1UL<<3)
#define OBD_MD_FLSIZE (1UL<<4)
-#define OBD_MD_FLATIME (1UL<<5)
-#define OBD_MD_FLMTIME (1UL<<6)
-#define OBD_MD_FLCTIME (1UL<<7)
-#define OBD_MD_FLFLAGS (1UL<<8)
-#define OBD_MD_FLBLOCKS (1UL<<9)
-#define OBD_MD_FLOBDMD (1UL<<10)
+#define OBD_MD_FLBLOCKS (1UL<<5)
+#define OBD_MD_FLBLKSZ (1UL<<6)
+#define OBD_MD_FLMODE (1UL<<7)
+#define OBD_MD_FLUID (1UL<<8)
+#define OBD_MD_FLGID (1UL<<9)
+#define OBD_MD_FLFLAGS (1UL<<10)
+#define OBD_MD_FLOBDFLG (1UL<<11)
+#define OBD_MD_FLINLINE (1UL<<12)
+#define OBD_MD_FLOBDMD (1UL<<13)
+
-static __inline__ void obdo_cpy_md(obdattr *dst, obdattr *src, int mask)
+static __inline__ void obdo_cpy_md(struct obdo *dst, struct obdo *src)
{
/* If the OBD_MD_NO flag is set, then we copy all EXCEPT those
* fields given by the flags. The default is to copy the field
* given by the flags.
*/
- if (mask & OBD_MD_NO)
- mask = ~mask;
+ if (src->o_valid & OBD_MD_NO)
+ src->o_valid = ~src->o_valid;
- CDEBUG(D_INODE, "flags %x\n", mask);
- if ( mask & OBD_MD_FLMODE )
+ CDEBUG(D_INODE, "flags %x\n", src->o_valid);
+ if ( src->o_valid & OBD_MD_FLMODE )
dst->i_mode = src->i_mode;
- if ( mask & OBD_MD_FLUID )
+ if ( src->o_valid & OBD_MD_FLUID )
dst->i_uid = src->i_uid;
- if ( mask & OBD_MD_FLGID )
+ if ( src->o_valid & OBD_MD_FLGID )
dst->i_gid = src->i_gid;
- if ( mask & OBD_MD_FLSIZE )
+ if ( src->o_valid & OBD_MD_FLSIZE )
dst->i_size = src->i_size;
- if ( mask & OBD_MD_FLATIME )
+ if ( src->o_valid & OBD_MD_FLATIME )
dst->i_atime = src->i_atime;
- if ( mask & OBD_MD_FLMTIME )
+ if ( src->o_valid & OBD_MD_FLMTIME )
dst->i_mtime = src->i_mtime;
- if ( mask & OBD_MD_FLCTIME )
+ if ( src->o_valid & OBD_MD_FLCTIME )
dst->i_ctime = src->i_ctime;
- if ( mask & OBD_MD_FLFLAGS )
+ if ( src->o_valid & OBD_MD_FLFLAGS )
dst->i_flags = src->i_flags;
/* allocation of space */
- if ( mask & OBD_MD_FLBLOCKS )
+ if ( src->o_valid & OBD_MD_FLBLOCKS )
dst->i_blocks = src->i_blocks;
- if ( mask & OBD_MD_FLOBDMD && src->i_blocks == 0 ) {
+ if ( src->o_valid & OBD_MD_FLOBDMD && src->i_blocks == 0 ) {
CDEBUG(D_IOCTL, "copying inline data: ino %ld\n", dst->i_ino);
memcpy(&dst->u.ext2_i.i_data, &src->u.ext2_i.i_data,
sizeof(src->u.ext2_i.i_data));
}
}
+static __inline__ void obdo_cpy_from_inode(struct obdo *dst, struct inode *src)
+{
+}
-static __inline__ int obdo_cmp_md(obdattr *dst, obdattr *src, int mask)
+static __inline__ void obdo_cpy_from_oa(struct inode *dst, struct obdo *src)
{
- int res = 1;
+}
- /* If the OBD_MD_NO flag is set, then we copy all EXCEPT those
- * fields given by the flags. The default is to copy the field
- * given by the flags.
- */
- if (mask & OBD_MD_NO)
- mask = ~mask;
+static __inline__ int obdo_cmp_md(struct obdo *dst, struct obdo *src)
+{
+ int res = 1;
- if ( mask & OBD_MD_FLMODE )
+ if ( src->o_valid & OBD_MD_FLMODE )
res = (res && (dst->i_mode == src->i_mode));
- if ( mask & OBD_MD_FLUID )
+ if ( src->o_valid & OBD_MD_FLUID )
res = (res && (dst->i_uid == src->i_uid));
- if ( mask & OBD_MD_FLGID )
+ if ( src->o_valid & OBD_MD_FLGID )
res = (res && (dst->i_gid == src->i_gid));
- if ( mask & OBD_MD_FLSIZE )
+ if ( src->o_valid & OBD_MD_FLSIZE )
res = (res && (dst->i_size == src->i_size));
- if ( mask & OBD_MD_FLATIME )
+ if ( src->o_valid & OBD_MD_FLATIME )
res = (res && (dst->i_atime == src->i_atime));
- if ( mask & OBD_MD_FLMTIME )
+ if ( src->o_valid & OBD_MD_FLMTIME )
res = (res && (dst->i_mtime == src->i_mtime));
- if ( mask & OBD_MD_FLCTIME )
+ if ( src->o_valid & OBD_MD_FLCTIME )
res = (res && (dst->i_ctime == src->i_ctime));
- if ( mask & OBD_MD_FLFLAGS )
+ if ( src->o_valid & OBD_MD_FLFLAGS )
res = (res && (dst->i_flags == src->i_flags));
/* allocation of space */
- if ( mask & OBD_MD_FLBLOCKS )
+ if ( src->o_valid & OBD_MD_FLBLOCKS )
res = (res && (dst->i_blocks == src->i_blocks));
return res;
}
-static __inline__ void obd_cpy_appmd(obdattr *dst, obdattr *src)
-{
- dst->i_mode = src->i_mode;
- dst->i_uid = src->i_uid;
- dst->i_gid = src->i_gid;
- dst->i_size = src->i_size;
- dst->i_atime = src->i_atime;
- dst->i_mtime = src->i_mtime;
- dst->i_ctime = src->i_ctime;
- dst->i_flags = src->i_flags;
- /* allocation of space */
- dst->i_blocks = src->i_blocks;
-}
-
#endif /* __LINUX_CLASS_OBD_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff