X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_class.h;h=7bd0b5ecca9d4fcae9200d700a469470c9d215ad;hb=9d9b3fa84a5fafe7ea0906b5cdae3be119a62b25;hp=a9e36ba1c75482755b76855a29d220b5066c7c34;hpb=676fff00c079ff7e91b091db76756e36bd29e572;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index a9e36ba..7bd0b5e 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -60,11 +60,12 @@ /* OBD Device Declarations */ extern struct obd_device *obd_devs[MAX_OBD_DEVICES]; -extern spinlock_t obd_dev_lock; +extern cfs_spinlock_t obd_dev_lock; /* OBD Operations Declarations */ extern struct obd_device *class_conn2obd(struct lustre_handle *); extern struct obd_device *class_exp2obd(struct obd_export *); +extern int class_handle_ioctl(unsigned int cmd, unsigned long arg); struct lu_device_type; @@ -102,7 +103,6 @@ void obd_zombie_impexp_stop(void); void obd_zombie_impexp_cull(void); void obd_zombie_barrier(void); void obd_exports_barrier(struct obd_device *obd); - /* obd_config.c */ int class_process_config(struct lustre_cfg *lcfg); int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, @@ -115,7 +115,7 @@ struct obd_device *class_incref(struct obd_device *obd, const char *scope, const void *source); void class_decref(struct obd_device *obd, const char *scope, const void *source); -void dump_exports(struct obd_device *obd); +void dump_exports(struct obd_device *obd, int locks); /*obdecho*/ #ifdef LPROCFS @@ -149,20 +149,21 @@ int class_config_dump_llog(struct llog_ctxt *ctxt, char *name, /* list of active configuration logs */ struct config_llog_data { - char *cld_logname; - struct ldlm_res_id cld_resid; + char *cld_logname; + struct ldlm_res_id cld_resid; struct config_llog_instance cld_cfg; - struct list_head cld_list_chain; - atomic_t cld_refcount; - struct config_llog_data *cld_sptlrpc;/* depended sptlrpc log */ - struct obd_export *cld_mgcexp; - unsigned int cld_stopping:1, /* we were told to stop watching */ - cld_lostlock:1, /* lock not requeued */ - cld_is_sptlrpc:1; + cfs_list_t cld_list_chain; + cfs_atomic_t cld_refcount; + struct config_llog_data *cld_sptlrpc;/* depended sptlrpc log */ + struct obd_export *cld_mgcexp; + unsigned int cld_stopping:1, /* we were told to stop + * watching */ + cld_lostlock:1, /* lock not requeued */ + cld_is_sptlrpc:1; }; struct lustre_profile { - struct list_head lp_list; + cfs_list_t lp_list; char *lp_profile; char *lp_dt; char *lp_md; @@ -172,19 +173,69 @@ struct lustre_profile *class_get_profile(const char * prof); void class_del_profile(const char *prof); void class_del_profiles(void); +#if LUSTRE_TRACKS_LOCK_EXP_REFS + +void __class_export_add_lock_ref(struct obd_export *, struct ldlm_lock *); +void __class_export_del_lock_ref(struct obd_export *, struct ldlm_lock *); +extern void (*class_export_dump_hook)(struct obd_export *); + +#else + +#define __class_export_add_lock_ref(exp, lock) do {} while(0) +#define __class_export_del_lock_ref(exp, lock) do {} while(0) + +#endif + #define class_export_rpc_get(exp) \ ({ \ - atomic_inc(&(exp)->exp_rpc_count); \ + cfs_atomic_inc(&(exp)->exp_rpc_count); \ CDEBUG(D_INFO, "RPC GETting export %p : new rpc_count %d\n", \ - (exp), atomic_read(&(exp)->exp_rpc_count)); \ + (exp), cfs_atomic_read(&(exp)->exp_rpc_count)); \ class_export_get(exp); \ }) #define class_export_rpc_put(exp) \ ({ \ - atomic_dec(&(exp)->exp_rpc_count); \ + LASSERT(cfs_atomic_read(&exp->exp_rpc_count) > 0); \ + cfs_atomic_dec(&(exp)->exp_rpc_count); \ CDEBUG(D_INFO, "RPC PUTting export %p : new rpc_count %d\n", \ - (exp), atomic_read(&(exp)->exp_rpc_count)); \ + (exp), cfs_atomic_read(&(exp)->exp_rpc_count)); \ + class_export_put(exp); \ +}) + +#define class_export_lock_get(exp, lock) \ +({ \ + cfs_atomic_inc(&(exp)->exp_locks_count); \ + __class_export_add_lock_ref(exp, lock); \ + CDEBUG(D_INFO, "lock GETting export %p : new locks_count %d\n", \ + (exp), cfs_atomic_read(&(exp)->exp_locks_count)); \ + class_export_get(exp); \ +}) + +#define class_export_lock_put(exp, lock) \ +({ \ + LASSERT(cfs_atomic_read(&exp->exp_locks_count) > 0); \ + cfs_atomic_dec(&(exp)->exp_locks_count); \ + __class_export_del_lock_ref(exp, lock); \ + CDEBUG(D_INFO, "lock PUTting export %p : new locks_count %d\n", \ + (exp), cfs_atomic_read(&(exp)->exp_locks_count)); \ + class_export_put(exp); \ +}) + +#define class_export_cb_get(exp) \ +({ \ + cfs_atomic_inc(&(exp)->exp_cb_count); \ + CDEBUG(D_INFO, "callback GETting export %p : new cb_count %d\n",\ + (exp), cfs_atomic_read(&(exp)->exp_cb_count)); \ + class_export_get(exp); \ +}) + +#define class_export_cb_put(exp) \ +({ \ + LASSERT(cfs_atomic_read(&exp->exp_cb_count) > 0); \ + cfs_atomic_dec(&(exp)->exp_cb_count); \ + CDEBUG(D_INFO, "callback PUTting export %p : new cb_count %d\n",\ + (exp), cfs_atomic_read(&(exp)->exp_cb_count)); \ class_export_put(exp); \ }) @@ -207,6 +258,7 @@ int class_connect(struct lustre_handle *conn, struct obd_device *obd, struct obd_uuid *cluuid); int class_disconnect(struct obd_export *exp); void class_fail_export(struct obd_export *exp); +int class_connected_export(struct obd_export *exp); void class_disconnect_exports(struct obd_device *obddev); int class_manual_cleanup(struct obd_device *obd); void class_disconnect_stale_exports(struct obd_device *, @@ -219,6 +271,18 @@ static inline enum obd_option exp_flags_from_obd(struct obd_device *obd) 0); } +static inline struct lu_target *class_exp2tgt(struct obd_export *exp) +{ + LASSERT(exp->exp_obd); + return exp->exp_obd->u.obt.obt_lut; +} + +static inline struct lr_server_data *class_server_data(struct obd_device *obd) +{ + LASSERT(obd->u.obt.obt_lut); + return &obd->u.obt.obt_lut->lut_lsd; +} + void obdo_cpy_md(struct obdo *dst, struct obdo *src, obd_flag valid); void obdo_to_ioobj(struct obdo *oa, struct obd_ioobj *ioobj); void obdo_from_iattr(struct obdo *oa, struct iattr *attr, @@ -648,20 +712,6 @@ static inline int obd_free_memmd(struct obd_export *exp, return rc; } -static inline int obd_checkmd(struct obd_export *exp, - struct obd_export *md_exp, - struct lov_stripe_md *mem_tgt) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, checkmd); - EXP_COUNTER_INCREMENT(exp, checkmd); - - rc = OBP(exp->exp_obd, checkmd)(exp, md_exp, mem_tgt); - RETURN(rc); -} - static inline int obd_precreate(struct obd_export *exp) { int rc; @@ -1079,10 +1129,6 @@ obd_lvfs_open_llog(struct obd_export *exp, __u64 id_ino, struct dentry *dentry) return 0; } -#ifndef time_before -#define time_before(t1, t2) ((long)t2 - (long)t1 > 0) -#endif - /* @max_age is the oldest time in jiffies that we accept using a cached data. * If the cache is older than @max_age we will get a new value from the * target. Use a value of "cfs_time_current() + HZ" to guarantee freshness. */ @@ -1110,9 +1156,9 @@ static inline int obd_statfs_async(struct obd_device *obd, obd->obd_name, &obd->obd_osfs, obd->obd_osfs.os_bavail, obd->obd_osfs.os_blocks, obd->obd_osfs.os_ffree, obd->obd_osfs.os_files); - spin_lock(&obd->obd_osfs_lock); + cfs_spin_lock(&obd->obd_osfs_lock); memcpy(oinfo->oi_osfs, &obd->obd_osfs, sizeof(*oinfo->oi_osfs)); - spin_unlock(&obd->obd_osfs_lock); + cfs_spin_unlock(&obd->obd_osfs_lock); oinfo->oi_flags |= OBD_STATFS_FROM_CACHE; if (oinfo->oi_cb_up) oinfo->oi_cb_up(oinfo, 0); @@ -1162,10 +1208,10 @@ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs, if (cfs_time_before_64(obd->obd_osfs_age, max_age)) { rc = OBP(obd, statfs)(obd, osfs, max_age, flags); if (rc == 0) { - spin_lock(&obd->obd_osfs_lock); + cfs_spin_lock(&obd->obd_osfs_lock); memcpy(&obd->obd_osfs, osfs, sizeof(obd->obd_osfs)); obd->obd_osfs_age = cfs_time_current_64(); - spin_unlock(&obd->obd_osfs_lock); + cfs_spin_unlock(&obd->obd_osfs_lock); } } else { CDEBUG(D_SUPER,"%s: use %p cache blocks "LPU64"/"LPU64 @@ -1173,9 +1219,9 @@ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs, obd->obd_name, &obd->obd_osfs, obd->obd_osfs.os_bavail, obd->obd_osfs.os_blocks, obd->obd_osfs.os_ffree, obd->obd_osfs.os_files); - spin_lock(&obd->obd_osfs_lock); + cfs_spin_lock(&obd->obd_osfs_lock); memcpy(osfs, &obd->obd_osfs, sizeof(*osfs)); - spin_unlock(&obd->obd_osfs_lock); + cfs_spin_unlock(&obd->obd_osfs_lock); } RETURN(rc); } @@ -1376,6 +1422,20 @@ static inline int obd_change_cbdata(struct obd_export *exp, RETURN(rc); } +static inline int obd_find_cbdata(struct obd_export *exp, + struct lov_stripe_md *lsm, + ldlm_iterator_t it, void *data) +{ + int rc; + ENTRY; + + EXP_CHECK_DT_OP(exp, find_cbdata); + EXP_COUNTER_INCREMENT(exp, find_cbdata); + + rc = OBP(exp->exp_obd, find_cbdata)(exp, lsm, it, data); + RETURN(rc); +} + static inline int obd_cancel(struct obd_export *exp, struct lov_stripe_md *ea, __u32 mode, struct lustre_handle *lockh) @@ -1558,7 +1618,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, #if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) if (qctxt) - do_gettimeofday(&work_start); + cfs_gettimeofday(&work_start); #endif EXP_CHECK_DT_OP(exp, quota_adjust_qunit); EXP_COUNTER_INCREMENT(exp, quota_adjust_qunit); @@ -1567,7 +1627,7 @@ static inline int obd_quota_adjust_qunit(struct obd_export *exp, #if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) if (qctxt) { - do_gettimeofday(&work_end); + cfs_gettimeofday(&work_end); timediff = cfs_timeval_sub(&work_end, &work_start, NULL); lprocfs_counter_add(qctxt->lqc_stats, LQUOTA_ADJUST_QUNIT, timediff); @@ -1607,9 +1667,34 @@ static inline int obd_register_observer(struct obd_device *obd, { ENTRY; OBD_CHECK_DEV(obd); - if (obd->obd_observer && observer) + cfs_down_write(&obd->obd_observer_link_sem); + if (obd->obd_observer && observer) { + cfs_up_write(&obd->obd_observer_link_sem); RETURN(-EALREADY); + } obd->obd_observer = observer; + cfs_up_write(&obd->obd_observer_link_sem); + RETURN(0); +} + +static inline int obd_pin_observer(struct obd_device *obd, + struct obd_device **observer) +{ + ENTRY; + cfs_down_read(&obd->obd_observer_link_sem); + if (!obd->obd_observer) { + *observer = NULL; + cfs_up_read(&obd->obd_observer_link_sem); + RETURN(-ENOENT); + } + *observer = obd->obd_observer; + RETURN(0); +} + +static inline int obd_unpin_observer(struct obd_device *obd) +{ + ENTRY; + cfs_up_read(&obd->obd_observer_link_sem); RETURN(0); } @@ -1681,16 +1766,14 @@ static inline int md_getstatus(struct obd_export *exp, RETURN(rc); } -static inline int md_getattr(struct obd_export *exp, const struct lu_fid *fid, - struct obd_capa *oc, obd_valid valid, int ea_size, +static inline int md_getattr(struct obd_export *exp, struct md_op_data *op_data, struct ptlrpc_request **request) { int rc; ENTRY; EXP_CHECK_MD_OP(exp, getattr); EXP_MD_COUNTER_INCREMENT(exp, getattr); - rc = MDP(exp->exp_obd, getattr)(exp, fid, oc, valid, - ea_size, request); + rc = MDP(exp->exp_obd, getattr)(exp, op_data, request); RETURN(rc); } @@ -1706,6 +1789,18 @@ static inline int md_change_cbdata(struct obd_export *exp, RETURN(rc); } +static inline int md_find_cbdata(struct obd_export *exp, + const struct lu_fid *fid, + ldlm_iterator_t it, void *data) +{ + int rc; + ENTRY; + EXP_CHECK_MD_OP(exp, find_cbdata); + EXP_MD_COUNTER_INCREMENT(exp, find_cbdata); + rc = MDP(exp->exp_obd, find_cbdata)(exp, fid, it, data); + RETURN(rc); +} + static inline int md_close(struct obd_export *exp, struct md_op_data *op_data, struct md_open_data *mod, struct ptlrpc_request **request) @@ -1763,17 +1858,14 @@ static inline int md_enqueue(struct obd_export *exp, } static inline int md_getattr_name(struct obd_export *exp, - const struct lu_fid *fid, struct obd_capa *oc, - const char *name, int namelen, - obd_valid valid, int ea_size, __u32 suppgid, + struct md_op_data *op_data, struct ptlrpc_request **request) { int rc; ENTRY; EXP_CHECK_MD_OP(exp, getattr_name); EXP_MD_COUNTER_INCREMENT(exp, getattr_name); - rc = MDP(exp->exp_obd, getattr_name)(exp, fid, oc, name, namelen, - valid, ea_size, suppgid, request); + rc = MDP(exp->exp_obd, getattr_name)(exp, op_data, request); RETURN(rc); } @@ -2049,13 +2141,13 @@ static inline int md_intent_getattr_async(struct obd_export *exp, static inline int md_revalidate_lock(struct obd_export *exp, struct lookup_intent *it, - struct lu_fid *fid) + struct lu_fid *fid, __u32 *bits) { int rc; ENTRY; EXP_CHECK_MD_OP(exp, revalidate_lock); EXP_MD_COUNTER_INCREMENT(exp, revalidate_lock); - rc = MDP(exp->exp_obd, revalidate_lock)(exp, it, fid); + rc = MDP(exp->exp_obd, revalidate_lock)(exp, it, fid, bits); RETURN(rc); }