X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Fobd_class.h;h=0a75ed79af1263eaeb10fd800054a490d014cd94;hp=7054978e155541541a3aa3670f0a6fbdf45e2356;hb=6cdee33c927b30502925e9b007739f2317b72871;hpb=f6e2f83978f715293b3f78fd91971027eb033b36 diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h index 7054978..0a75ed7 100644 --- a/lustre/include/linux/obd_class.h +++ b/lustre/include/linux/obd_class.h @@ -28,7 +28,7 @@ # define __KERNEL__ # include # undef __KERNEL__ -#else +#else #include #include #include @@ -39,12 +39,15 @@ #include #include #include +#include +#include #endif + /* * ======== OBD Device Declarations =========== */ -#define MAX_OBD_DEVICES 8 +#define MAX_OBD_DEVICES 128 extern struct obd_device obd_dev[MAX_OBD_DEVICES]; #define OBD_ATTACHED 0x1 @@ -60,44 +63,32 @@ extern void proc_lustre_remove_obd_entry(const char* name, * ======== OBD Operations Declarations =========== */ -#define OBD_BRW_READ 1 -#define OBD_BRW_WRITE 2 -#define OBD_BRW_RWMASK OBD_BRW_READ | OBD_BRW_WRITE -#define OBD_BRW_CREATE 4 - #ifdef __KERNEL__ -struct obd_request { - struct obdo *oa; - struct obd_conn *conn; - __u32 plen1; - char *pbuf1; -}; - -static inline int obd_check_conn(struct obd_conn *conn) +static inline int obd_check_conn(struct lustre_handle *conn) { struct obd_device *obd; if (!conn) { - CERROR("obd_check_conn: NULL conn\n"); + CERROR("NULL conn\n"); RETURN(-ENOTCONN); } - obd = conn->oc_dev; + obd = class_conn2obd(conn); if (!obd) { - CERROR("obd_check_conn: NULL obd\n"); + CERROR("NULL obd\n"); RETURN(-ENODEV); } if (!obd->obd_flags & OBD_ATTACHED ) { - CERROR("obd_check_conn: obd %d not attached\n", obd->obd_minor); + CERROR("obd %d not attached\n", obd->obd_minor); RETURN(-ENODEV); } if (!obd->obd_flags & OBD_SET_UP) { - CERROR("obd_check_conn: obd %d not setup\n", obd->obd_minor); + CERROR("obd %d not setup\n", obd->obd_minor); RETURN(-ENODEV); } if (!obd->obd_type) { - CERROR("obd_check_conn: obd %d not typed\n", obd->obd_minor); + CERROR("obd %d not typed\n", obd->obd_minor); RETURN(-ENODEV); } @@ -109,278 +100,347 @@ static inline int obd_check_conn(struct obd_conn *conn) return 0; } + #define OBT(dev) (dev)->obd_type -#define OBP(dev,op) (dev)->obd_type->typ_ops->o_ ## op +#define OBP(dev, op) (dev)->obd_type->typ_ops->o_ ## op -#define OBD_CHECK_SETUP(conn) \ +#define OBD_CHECK_SETUP(conn, exp) \ do { \ if (!(conn)) { \ CERROR("NULL connection\n"); \ RETURN(-EINVAL); \ } \ \ - if (!((conn)->oc_dev)) { \ - CERROR("NULL device\n"); \ + exp = class_conn2export(conn); \ + if (!(exp)) { \ + CERROR("No export\n"); \ RETURN(-EINVAL); \ } \ \ - if ( !((conn)->oc_dev->obd_flags & OBD_SET_UP) ) { \ + if (!((exp)->exp_obd->obd_flags & OBD_SET_UP)) { \ CERROR("Device %d not setup\n", \ - (conn)->oc_dev->obd_minor); \ + (exp)->exp_obd->obd_minor); \ RETURN(-EINVAL); \ } \ } while (0) -#define OBD_CHECK_OP(conn,op) \ +#define OBD_CHECK_DEVSETUP(obd) \ do { \ - int rc = obd_check_conn(conn); \ - if (rc) { \ - CERROR("obd: error in operation: " #op "\n"); \ - RETURN(rc); \ + if (!(obd)) { \ + CERROR("NULL device\n"); \ + RETURN(-EINVAL); \ } \ - if (!OBP(conn->oc_dev,op)) { \ + \ + if (!((obd)->obd_flags & OBD_SET_UP)) { \ + CERROR("Device %d not setup\n", \ + (obd)->obd_minor); \ + RETURN(-EINVAL); \ + } \ +} while (0) + +#define OBD_CHECK_OP(obd, op) \ +do { \ + if (!OBP((obd), op)) { \ CERROR("obd_" #op ": dev %d no operation\n", \ - conn->oc_dev->obd_minor); \ + obd->obd_minor); \ RETURN(-EOPNOTSUPP); \ } \ } while (0) -static inline int obd_get_info(struct obd_conn *conn, obd_count keylen, +static inline int obd_get_info(struct lustre_handle *conn, obd_count keylen, void *key, obd_count *vallen, void **val) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,get_info); - rc = OBP(conn->oc_dev, get_info)(conn, keylen, key, vallen, val); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, get_info); + + rc = OBP(exp->exp_obd, get_info)(conn, keylen, key, vallen, val); RETURN(rc); } -static inline int obd_set_info(struct obd_conn *conn, obd_count keylen, +static inline int obd_set_info(struct lustre_handle *conn, obd_count keylen, void *key, obd_count vallen, void *val) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,set_info); - rc = OBP(conn->oc_dev, set_info)(conn, keylen, key, vallen, val); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, set_info); + + rc = OBP(exp->exp_obd, set_info)(conn, keylen, key, vallen, val); RETURN(rc); } static inline int obd_setup(struct obd_device *obd, int datalen, void *data) { - struct obd_conn conn; int rc; - conn.oc_dev = obd; - OBD_CHECK_OP((&conn),setup); + OBD_CHECK_OP(obd, setup); - rc = OBP(conn.oc_dev, setup)(obd, datalen, data); + rc = OBP(obd, setup)(obd, datalen, data); RETURN(rc); } static inline int obd_cleanup(struct obd_device *obd) { - struct obd_conn conn; int rc; - conn.oc_dev = obd; - OBD_CHECK_SETUP(&conn); - OBD_CHECK_OP((&conn),cleanup); + OBD_CHECK_DEVSETUP(obd); + OBD_CHECK_OP(obd, cleanup); - rc = OBP(conn.oc_dev, cleanup)(obd); + rc = OBP(obd, cleanup)(obd); RETURN(rc); } -static inline int obd_create(struct obd_conn *conn, struct obdo *obdo) +static inline int obd_create(struct lustre_handle *conn, struct obdo *obdo, + struct lov_stripe_md **ea) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,create); - rc = OBP(conn->oc_dev, create)(conn, obdo); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, create); + + rc = OBP(exp->exp_obd, create)(conn, obdo, ea); RETURN(rc); } -static inline int obd_destroy(struct obd_conn *conn, struct obdo *obdo) +static inline int obd_destroy(struct lustre_handle *conn, struct obdo *obdo, + struct lov_stripe_md *ea) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,destroy); - rc = OBP(conn->oc_dev, destroy)(conn, obdo); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, destroy); + + rc = OBP(exp->exp_obd, destroy)(conn, obdo, ea); RETURN(rc); } -static inline int obd_getattr(struct obd_conn *conn, struct obdo *obdo) +static inline int obd_getattr(struct lustre_handle *conn, struct obdo *obdo, + struct lov_stripe_md *ea) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,getattr); - rc = OBP(conn->oc_dev, getattr)(conn, obdo); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, getattr); + + rc = OBP(exp->exp_obd, getattr)(conn, obdo, ea); RETURN(rc); } -static inline int obd_close(struct obd_conn *conn, struct obdo *obdo) +static inline int obd_close(struct lustre_handle *conn, struct obdo *obdo, + struct lov_stripe_md *ea) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,close); - rc = OBP(conn->oc_dev, close)(conn, obdo); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, close); + + rc = OBP(exp->exp_obd, close)(conn, obdo, ea); RETURN(rc); } -static inline int obd_open(struct obd_conn *conn, struct obdo *obdo) + +static inline int obd_open(struct lustre_handle *conn, struct obdo *obdo, + struct lov_stripe_md *ea) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,open); - rc = OBP(conn->oc_dev, open) (conn, obdo); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, open); + + rc = OBP(exp->exp_obd, open)(conn, obdo, ea); RETURN(rc); } -static inline int obd_setattr(struct obd_conn *conn, struct obdo *obdo) +static inline int obd_setattr(struct lustre_handle *conn, struct obdo *obdo, + struct lov_stripe_md *ea) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,setattr); - rc = OBP(conn->oc_dev, setattr)(conn, obdo); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, setattr); + + rc = OBP(exp->exp_obd, setattr)(conn, obdo, ea); RETURN(rc); } -static inline int obd_connect(struct obd_conn *conn) +static inline int obd_connect(struct lustre_handle *conn, + struct obd_device *obd, obd_uuid_t cluuid) { int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,connect); - rc = OBP(conn->oc_dev, connect)(conn); + OBD_CHECK_DEVSETUP(obd); + OBD_CHECK_OP(obd, connect); + + rc = OBP(obd, connect)(conn, obd, cluuid); RETURN(rc); } -static inline int obd_disconnect(struct obd_conn *conn) +static inline int obd_disconnect(struct lustre_handle *conn) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,disconnect); - rc = OBP(conn->oc_dev, disconnect)(conn); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, disconnect); + + rc = OBP(exp->exp_obd, disconnect)(conn); RETURN(rc); } -static inline int obd_statfs(struct obd_conn *conn, struct statfs *buf) +static inline int obd_statfs(struct lustre_handle *conn,struct obd_statfs *osfs) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,statfs); - rc = OBP(conn->oc_dev, statfs)(conn, buf); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, statfs); + + rc = OBP(exp->exp_obd, statfs)(conn, osfs); RETURN(rc); } -static inline int obd_punch(struct obd_conn *conn, struct obdo *tgt, +static inline int obd_punch(struct lustre_handle *conn, struct obdo *oa, + struct lov_stripe_md *ea, obd_size count, obd_off offset) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,punch); - rc = OBP(conn->oc_dev, punch)(conn, tgt, count, offset); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, punch); + + rc = OBP(exp->exp_obd, punch)(conn, oa, ea, count, offset); RETURN(rc); } -static inline int obd_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, void *callback) +static inline int obd_brw(int cmd, struct lustre_handle *conn, + struct lov_stripe_md *ea, obd_count oa_bufs, + struct brw_page *pg, + brw_callback_t callback, void *data) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn,brw); - rc = OBP(conn->oc_dev, brw)(rw, conn, num_oa, oa, oa_bufs, buf, - count, offset, flags, callback); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, brw); + + if (!(cmd & OBD_BRW_RWMASK)) { + CERROR("obd_brw: cmd must be OBD_BRW_READ or OBD_BRW_WRITE\n"); + LBUG(); + } + + rc = OBP(exp->exp_obd, brw)(cmd, conn, ea, oa_bufs, pg, callback, data); RETURN(rc); } -static inline int obd_preprw(int cmd, struct obd_conn *conn, +static inline int obd_preprw(int cmd, struct lustre_handle *conn, int objcount, struct obd_ioobj *obj, int niocount, struct niobuf_remote *remote, struct niobuf_local *local, void **desc_private) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn, preprw); - rc = OBP(conn->oc_dev, preprw)(cmd, conn, objcount, obj, niocount, + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, preprw); + + rc = OBP(exp->exp_obd, preprw)(cmd, conn, objcount, obj, niocount, remote, local, desc_private); RETURN(rc); } -static inline int obd_commitrw(int cmd, struct obd_conn *conn, +static inline int obd_commitrw(int cmd, struct lustre_handle *conn, int objcount, struct obd_ioobj *obj, int niocount, struct niobuf_local *local, void *desc_private) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn, commitrw); - rc = OBP(conn->oc_dev, commitrw)(cmd, conn, objcount, obj, niocount, + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, commitrw); + + rc = OBP(exp->exp_obd, commitrw)(cmd, conn, objcount, obj, niocount, local, desc_private); RETURN(rc); } -static inline int obd_iocontrol(int cmd, struct obd_conn *conn, +static inline int obd_iocontrol(int cmd, struct lustre_handle *conn, int len, void *karg, void *uarg) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn, iocontrol); - rc = OBP(conn->oc_dev, iocontrol)(cmd, conn, len, karg, uarg); + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, iocontrol); + + rc = OBP(exp->exp_obd, iocontrol)(cmd, conn, len, karg, uarg); RETURN(rc); } -static inline int obd_enqueue(struct obd_conn *conn, struct ldlm_namespace *ns, - struct ldlm_handle *parent_lock, __u64 *res_id, - __u32 type, struct ldlm_extent *extent, - __u32 mode, int *flags, void *data, int datalen, - struct ldlm_handle *lockh) +static inline int obd_enqueue(struct lustre_handle *conn, + struct lov_stripe_md *ea, + 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) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn, enqueue); - - rc = OBP(conn->oc_dev, enqueue)(conn, ns, parent_lock, res_id, type, - extent, mode, flags, data, datalen, - lockh); + + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, enqueue); + + rc = OBP(exp->exp_obd, enqueue)(conn, ea, parent_lock, type, + cookie, cookielen, mode, flags, cb, + data, datalen, lockh); RETURN(rc); } -static inline int obd_cancel(struct obd_conn *conn, __u32 mode, - struct ldlm_handle *lockh) +static inline int obd_cancel(struct lustre_handle *conn, + struct lov_stripe_md *ea, __u32 mode, + struct lustre_handle *lockh) { + struct obd_export *exp; int rc; - OBD_CHECK_SETUP(conn); - OBD_CHECK_OP(conn, cancel); - - rc = OBP(conn->oc_dev, cancel)(conn, mode, lockh); + + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, cancel); + + rc = OBP(exp->exp_obd, cancel)(conn, ea, mode, lockh); + RETURN(rc); +} + +static inline int obd_cancel_unused(struct lustre_handle *conn, + struct lov_stripe_md *ea, int local) +{ + struct obd_export *exp; + int rc; + + OBD_CHECK_SETUP(conn, exp); + OBD_CHECK_OP(exp->exp_obd, cancel_unused); + + rc = OBP(exp->exp_obd, cancel_unused)(conn, ea, local); RETURN(rc); } -#endif +#endif /* * ======== OBD Metadata Support =========== */ -extern int obd_init_obdo_cache(void); -extern void obd_cleanup_obdo_cache(void); - +extern int obd_init_caches(void); +extern void obd_cleanup_caches(void); static inline int obdo_has_inline(struct obdo *obdo) { @@ -388,17 +448,10 @@ static inline int obdo_has_inline(struct obdo *obdo) obdo->o_obdflags & OBD_FL_INLINEDATA); }; -static inline int obdo_has_obdmd(struct obdo *obdo) -{ - return (obdo->o_valid & OBD_MD_FLOBDMD && - obdo->o_obdflags & OBD_FL_OBDMDEXISTS); -}; - #ifdef __KERNEL__ /* support routines */ extern kmem_cache_t *obdo_cachep; - -static __inline__ struct obdo *obdo_alloc(void) +static inline struct obdo *obdo_alloc(void) { struct obdo *oa = NULL; @@ -409,35 +462,13 @@ static __inline__ struct obdo *obdo_alloc(void) return oa; } - -static __inline__ void obdo_free(struct obdo *oa) +static inline void obdo_free(struct obdo *oa) { if (!oa) return; kmem_cache_free(obdo_cachep, oa); } -static __inline__ struct obdo *obdo_fromid(struct obd_conn *conn, obd_id id, - obd_mode mode, obd_flag valid) -{ - struct obdo *oa; - int err; - - ENTRY; - oa = obdo_alloc(); - if ( !oa ) { - RETURN(ERR_PTR(-ENOMEM)); - } - - oa->o_id = id; - oa->o_mode = mode; - oa->o_valid = valid; - if ((err = OBP(conn->oc_dev, getattr)(conn, oa))) { - obdo_free(oa); - RETURN(ERR_PTR(err)); - } - RETURN(oa); -} static inline void obdo_from_iattr(struct obdo *oa, struct iattr *attr) { @@ -461,12 +492,11 @@ static inline void obdo_from_iattr(struct obdo *oa, struct iattr *attr) } if (ia_valid & ATTR_MODE) { oa->o_mode = attr->ia_mode; - oa->o_valid |= OBD_MD_FLMODE; + oa->o_valid |= OBD_MD_FLTYPE | OBD_MD_FLMODE; if (!in_group_p(oa->o_gid) && !capable(CAP_FSETID)) oa->o_mode &= ~S_ISGID; } - if (ia_valid & ATTR_UID) - { + if (ia_valid & ATTR_UID) { oa->o_uid = attr->ia_uid; oa->o_valid |= OBD_MD_FLUID; } @@ -477,39 +507,42 @@ static inline void obdo_from_iattr(struct obdo *oa, struct iattr *attr) } -static inline void iattr_from_obdo(struct iattr *attr, struct obdo *oa) +static inline void iattr_from_obdo(struct iattr *attr, struct obdo *oa, + obd_flag valid) { - unsigned int ia_valid = oa->o_valid; - memset(attr, 0, sizeof(*attr)); - if (ia_valid & OBD_MD_FLATIME) { + if (valid & OBD_MD_FLATIME) { attr->ia_atime = oa->o_atime; attr->ia_valid |= ATTR_ATIME; } - if (ia_valid & OBD_MD_FLMTIME) { + if (valid & OBD_MD_FLMTIME) { attr->ia_mtime = oa->o_mtime; attr->ia_valid |= ATTR_MTIME; } - if (ia_valid & OBD_MD_FLCTIME) { + if (valid & OBD_MD_FLCTIME) { attr->ia_ctime = oa->o_ctime; attr->ia_valid |= ATTR_CTIME; } - if (ia_valid & OBD_MD_FLSIZE) { + if (valid & OBD_MD_FLSIZE) { attr->ia_size = oa->o_size; attr->ia_valid |= ATTR_SIZE; } - if (ia_valid & OBD_MD_FLMODE) { - attr->ia_mode = oa->o_mode; + if (valid & OBD_MD_FLTYPE) { + attr->ia_mode = (attr->ia_mode & ~S_IFMT)|(oa->o_mode & S_IFMT); + attr->ia_valid |= ATTR_MODE; + } + if (valid & OBD_MD_FLMODE) { + attr->ia_mode = (attr->ia_mode & S_IFMT)|(oa->o_mode & ~S_IFMT); attr->ia_valid |= ATTR_MODE; if (!in_group_p(oa->o_gid) && !capable(CAP_FSETID)) attr->ia_mode &= ~S_ISGID; } - if (ia_valid & OBD_MD_FLUID) + if (valid & OBD_MD_FLUID) { attr->ia_uid = oa->o_uid; attr->ia_valid |= ATTR_UID; } - if (ia_valid & OBD_MD_FLGID) { + if (valid & OBD_MD_FLGID) { attr->ia_gid = oa->o_gid; attr->ia_valid |= ATTR_GID; } @@ -519,122 +552,132 @@ static inline void iattr_from_obdo(struct iattr *attr, struct obdo *oa) /* WARNING: the file systems must take care not to tinker with attributes they don't manage (such as blocks). */ -static __inline__ void obdo_from_inode(struct obdo *dst, struct inode *src) +static inline void obdo_from_inode(struct obdo *dst, struct inode *src, + obd_flag valid) { - if ( dst->o_valid & OBD_MD_FLID ) - dst->o_id = src->i_ino; - if ( dst->o_valid & OBD_MD_FLATIME ) +// if (valid & OBD_MD_FLID) +// dst->o_id = src->i_ino; + if (valid & OBD_MD_FLATIME) dst->o_atime = src->i_atime; - if ( dst->o_valid & OBD_MD_FLMTIME ) + if (valid & OBD_MD_FLMTIME) dst->o_mtime = src->i_mtime; - if ( dst->o_valid & OBD_MD_FLCTIME ) + if (valid & OBD_MD_FLCTIME) dst->o_ctime = src->i_ctime; - if ( dst->o_valid & OBD_MD_FLSIZE ) + if (valid & OBD_MD_FLSIZE) dst->o_size = src->i_size; - if ( dst->o_valid & OBD_MD_FLBLOCKS ) /* allocation of space */ + if (valid & OBD_MD_FLBLOCKS) /* allocation of space */ dst->o_blocks = src->i_blocks; - if ( dst->o_valid & OBD_MD_FLBLKSZ ) + if (valid & OBD_MD_FLBLKSZ) dst->o_blksize = src->i_blksize; - if ( dst->o_valid & OBD_MD_FLMODE ) - dst->o_mode = src->i_mode; - if ( dst->o_valid & OBD_MD_FLUID ) + if (valid & OBD_MD_FLTYPE) + dst->o_mode = (dst->o_mode & ~S_IFMT) | (src->i_mode & S_IFMT); + if (valid & OBD_MD_FLMODE) + dst->o_mode = (dst->o_mode & S_IFMT) | (src->i_mode & ~S_IFMT); + if (valid & OBD_MD_FLUID) dst->o_uid = src->i_uid; - if ( dst->o_valid & OBD_MD_FLGID ) + if (valid & OBD_MD_FLGID) dst->o_gid = src->i_gid; - if ( dst->o_valid & OBD_MD_FLFLAGS ) + if (valid & OBD_MD_FLFLAGS) dst->o_flags = src->i_flags; - if ( dst->o_valid & OBD_MD_FLNLINK ) + if (valid & OBD_MD_FLNLINK) dst->o_nlink = src->i_nlink; - if ( dst->o_valid & OBD_MD_FLGENER ) + if (valid & OBD_MD_FLGENER) dst->o_generation = src->i_generation; + if (valid & OBD_MD_FLRDEV) + dst->o_rdev = src->i_rdev; + + dst->o_valid |= (valid & ~OBD_MD_FLID); } -static __inline__ void obdo_to_inode(struct inode *dst, struct obdo *src) +static inline void obdo_to_inode(struct inode *dst, struct obdo *src, + obd_flag valid) { - - if ( src->o_valid & OBD_MD_FLID ) - dst->i_ino = src->o_id; - if ( src->o_valid & OBD_MD_FLATIME ) +// if (valid & OBD_MD_FLID) +// dst->i_ino = src->o_id; + if (valid & OBD_MD_FLATIME) dst->i_atime = src->o_atime; - if ( src->o_valid & OBD_MD_FLMTIME ) + if (valid & OBD_MD_FLMTIME) dst->i_mtime = src->o_mtime; - if ( src->o_valid & OBD_MD_FLCTIME ) + if (valid & OBD_MD_FLCTIME) dst->i_ctime = src->o_ctime; - if ( src->o_valid & OBD_MD_FLSIZE ) + if (valid & OBD_MD_FLSIZE) dst->i_size = src->o_size; - if ( src->o_valid & OBD_MD_FLBLOCKS ) /* allocation of space */ + if (valid & OBD_MD_FLBLOCKS) /* allocation of space */ dst->i_blocks = src->o_blocks; - if ( src->o_valid & OBD_MD_FLBLKSZ ) + if (valid & OBD_MD_FLBLKSZ) dst->i_blksize = src->o_blksize; - if ( src->o_valid & OBD_MD_FLMODE ) - dst->i_mode = src->o_mode; - if ( src->o_valid & OBD_MD_FLUID ) + if (valid & OBD_MD_FLTYPE) + dst->i_mode = (dst->i_mode & ~S_IFMT) | (src->o_mode & S_IFMT); + if (valid & OBD_MD_FLMODE) + dst->i_mode = (dst->i_mode & S_IFMT) | (src->o_mode & ~S_IFMT); + if (valid & OBD_MD_FLUID) dst->i_uid = src->o_uid; - if ( src->o_valid & OBD_MD_FLGID ) + if (valid & OBD_MD_FLGID) dst->i_gid = src->o_gid; - if ( src->o_valid & OBD_MD_FLFLAGS ) + if (valid & OBD_MD_FLFLAGS) dst->i_flags = src->o_flags; - if ( src->o_valid & OBD_MD_FLNLINK ) + if (valid & OBD_MD_FLNLINK) dst->i_nlink = src->o_nlink; - if ( src->o_valid & OBD_MD_FLGENER ) + if (valid & OBD_MD_FLGENER) dst->i_generation = src->o_generation; + if (valid & OBD_MD_FLRDEV) + dst->i_rdev = src->o_rdev; } +#endif -#endif - -static __inline__ void obdo_cpy_md(struct obdo *dst, struct obdo *src) +static inline void obdo_cpy_md(struct obdo *dst, struct obdo *src, + obd_flag valid) { #ifdef __KERNEL__ CDEBUG(D_INODE, "src obdo %Ld valid 0x%x, dst obdo %Ld\n", (unsigned long long)src->o_id, src->o_valid, (unsigned long long)dst->o_id); #endif - if ( src->o_valid & OBD_MD_FLATIME ) + if (valid & OBD_MD_FLATIME) dst->o_atime = src->o_atime; - if ( src->o_valid & OBD_MD_FLMTIME ) + if (valid & OBD_MD_FLMTIME) dst->o_mtime = src->o_mtime; - if ( src->o_valid & OBD_MD_FLCTIME ) + if (valid & OBD_MD_FLCTIME) dst->o_ctime = src->o_ctime; - if ( src->o_valid & OBD_MD_FLSIZE ) + if (valid & OBD_MD_FLSIZE) dst->o_size = src->o_size; - if ( src->o_valid & OBD_MD_FLBLOCKS ) /* allocation of space */ + if (valid & OBD_MD_FLBLOCKS) /* allocation of space */ dst->o_blocks = src->o_blocks; - if ( src->o_valid & OBD_MD_FLBLKSZ ) + if (valid & OBD_MD_FLBLKSZ) dst->o_blksize = src->o_blksize; - if ( src->o_valid & OBD_MD_FLMODE ) - dst->o_mode = src->o_mode; - if ( src->o_valid & OBD_MD_FLUID ) + if (valid & OBD_MD_FLTYPE) + dst->o_mode = (dst->o_mode & ~S_IFMT) | (src->o_mode & S_IFMT); + if (valid & OBD_MD_FLMODE) + dst->o_mode = (dst->o_mode & S_IFMT) | (src->o_mode & ~S_IFMT); + if (valid & OBD_MD_FLUID) dst->o_uid = src->o_uid; - if ( src->o_valid & OBD_MD_FLGID ) + if (valid & OBD_MD_FLGID) dst->o_gid = src->o_gid; - if ( src->o_valid & OBD_MD_FLFLAGS ) + if (valid & OBD_MD_FLFLAGS) dst->o_flags = src->o_flags; /* - if ( src->o_valid & OBD_MD_FLOBDFLG ) + if (valid & OBD_MD_FLOBDFLG) dst->o_obdflags = src->o_obdflags; */ - if ( src->o_valid & OBD_MD_FLNLINK ) + if (valid & OBD_MD_FLNLINK) dst->o_nlink = src->o_nlink; - if ( src->o_valid & OBD_MD_FLGENER ) + if (valid & OBD_MD_FLGENER) dst->o_generation = src->o_generation; - if ( src->o_valid & OBD_MD_FLINLINE && + if (valid & OBD_MD_FLRDEV) + dst->o_rdev = src->o_rdev; + if (valid & OBD_MD_FLINLINE && src->o_obdflags & OBD_FL_INLINEDATA) { memcpy(dst->o_inline, src->o_inline, sizeof(src->o_inline)); dst->o_obdflags |= OBD_FL_INLINEDATA; } - if ( src->o_valid & OBD_MD_FLOBDMD && - src->o_obdflags & OBD_FL_OBDMDEXISTS) { - memcpy(dst->o_obdmd, src->o_obdmd, sizeof(src->o_obdmd)); - dst->o_obdflags |= OBD_FL_OBDMDEXISTS; - } - dst->o_valid |= src->o_valid; + dst->o_valid |= valid; } /* returns FALSE if comparison (by flags) is same, TRUE if changed */ -static __inline__ int obdo_cmp_md(struct obdo *dst, struct obdo *src, - obd_flag compare) +static inline int obdo_cmp_md(struct obdo *dst, struct obdo *src, + obd_flag compare) { int res = 0; @@ -650,13 +693,15 @@ static __inline__ int obdo_cmp_md(struct obdo *dst, struct obdo *src, res = (res || (dst->o_blocks != src->o_blocks)); if ( compare & OBD_MD_FLBLKSZ ) res = (res || (dst->o_blksize != src->o_blksize)); + if ( compare & OBD_MD_FLTYPE ) + res = (res || (((dst->o_mode ^ src->o_mode) & S_IFMT) != 0)); if ( compare & OBD_MD_FLMODE ) - res = (res || (dst->o_mode != src->o_mode)); + res = (res || (((dst->o_mode ^ src->o_mode) & ~S_IFMT) != 0)); if ( compare & OBD_MD_FLUID ) res = (res || (dst->o_uid != src->o_uid)); if ( compare & OBD_MD_FLGID ) res = (res || (dst->o_gid != src->o_gid)); - if ( compare & OBD_MD_FLFLAGS ) + if ( compare & OBD_MD_FLFLAGS ) res = (res || (dst->o_flags != src->o_flags)); if ( compare & OBD_MD_FLNLINK ) res = (res || (dst->o_nlink != src->o_nlink)); @@ -665,43 +710,35 @@ static __inline__ int obdo_cmp_md(struct obdo *dst, struct obdo *src, /* XXX Don't know if thses should be included here - wasn't previously if ( compare & OBD_MD_FLINLINE ) res = (res || memcmp(dst->o_inline, src->o_inline)); - if ( compare & OBD_MD_FLOBDMD ) - res = (res || memcmp(dst->o_obdmd, src->o_obdmd)); */ return res; } #ifdef __KERNEL__ -int obd_register_type(struct obd_ops *ops, char *nm); -int obd_unregister_type(char *nm); - -struct obd_client { - struct list_head cli_chain; - struct obd_device *cli_obd; - unsigned int cli_id; - unsigned long cli_prealloc_quota; - struct list_head cli_prealloc_inodes; -}; +int class_register_type(struct obd_ops *ops, char *nm); +int class_unregister_type(char *nm); +int class_name2dev(char *name); +int class_uuid2dev(char *uuid); +struct obd_device *class_uuid2obd(char *uuid); +struct obd_export *class_new_export(struct obd_device *obddev); +void class_destroy_export(struct obd_export *exp); +int class_connect(struct lustre_handle *conn, struct obd_device *obd, + obd_uuid_t cluuid); +int class_disconnect(struct lustre_handle *conn); +void class_disconnect_all(struct obd_device *obddev); +/* generic operations shared by various OBD types */ +int class_multi_setup(struct obd_device *obddev, uint32_t len, void *data); +int class_multi_cleanup(struct obd_device *obddev); -struct obd_prealloc_inode { - struct list_head obd_prealloc_chain; - unsigned long inode; -}; +extern void (*class_signal_connection_failure)(struct ptlrpc_connection *); -/* 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); -struct obd_client *gen_client(const struct obd_conn *); -int gen_cleanup(struct obd_device *obddev); -int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst, - struct obd_conn *src_conn, struct obdo *src, - obd_size count, obd_off offset); +static inline struct ptlrpc_connection *class_rd2conn(struct recovd_data *rd) +{ + /* reuse list_entry's member-pointer offset stuff */ + return list_entry(rd, struct ptlrpc_connection, c_recovd_data); +} #endif @@ -709,4 +746,8 @@ int gen_copy_data(struct obd_conn *dst_conn, struct obdo *dst, extern void obd_sysctl_init (void); extern void obd_sysctl_clean (void); +/* uuid.c */ +typedef __u8 class_uuid_t[16]; +//int class_uuid_parse(obd_uuid_t in, class_uuid_t out); +void class_uuid_unparse(class_uuid_t in, obd_uuid_t out); #endif /* __LINUX_CLASS_OBD_H */