X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Finclude%2Fobd_class.h;h=54d0a65660ffe55f8a0e5d4feba279dfad4de81f;hb=5538eee216a194d47ae67fbcff80bfbcd95f3d69;hp=5adae76c72893d855d5d824ca6b12979813c4dcf;hpb=2e0ad6d40070d38076c77038b7d48ac90af7b130;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index 5adae76..54d0a65 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -30,6 +30,9 @@ * Use is subject to license terms. */ /* + * Copyright (c) 2011 Whamcloud, Inc. + */ +/* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ @@ -60,7 +63,7 @@ /* OBD Device Declarations */ extern struct obd_device *obd_devs[MAX_OBD_DEVICES]; -extern cfs_spinlock_t obd_dev_lock; +extern cfs_rwlock_t obd_dev_lock; /* OBD Operations Declarations */ extern struct obd_device *class_conn2obd(struct lustre_handle *); @@ -97,6 +100,7 @@ char *obd_export_nid2str(struct obd_export *exp); int obd_export_evict_by_nid(struct obd_device *obd, const char *nid); int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid); +int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep); int obd_zombie_impexp_init(void); void obd_zombie_impexp_stop(void); @@ -141,8 +145,8 @@ static inline void lprocfs_echo_init_vars(struct lprocfs_static_vars *lvars) /* Passed as data param to class_config_parse_llog */ struct config_llog_instance { - char * cfg_instance; - char * cfg_obdname; + char *cfg_obdname; + void *cfg_instance; struct super_block *cfg_sb; struct obd_uuid cfg_uuid; int cfg_last_idx; /* for partial llog processing */ @@ -153,9 +157,14 @@ int class_config_parse_llog(struct llog_ctxt *ctxt, char *name, int class_config_dump_llog(struct llog_ctxt *ctxt, char *name, struct config_llog_instance *cfg); +enum { + CONFIG_T_CONFIG = 0, + CONFIG_T_SPTLRPC = 1, + CONFIG_T_MAX = 2 +}; + /* list of active configuration logs */ struct config_llog_data { - char *cld_logname; struct ldlm_res_id cld_resid; struct config_llog_instance cld_cfg; cfs_list_t cld_list_chain; @@ -163,10 +172,11 @@ struct config_llog_data { struct config_llog_data *cld_sptlrpc;/* depended sptlrpc log */ struct obd_export *cld_mgcexp; cfs_mutex_t cld_lock; + int cld_type; unsigned int cld_stopping:1, /* we were told to stop * watching */ - cld_lostlock:1, /* lock not requeued */ - cld_is_sptlrpc:1; + cld_lostlock:1; /* lock not requeued */ + char cld_logname[0]; }; struct lustre_profile { @@ -203,7 +213,7 @@ extern void (*class_export_dump_hook)(struct obd_export *); #define class_export_rpc_put(exp) \ ({ \ - LASSERT(cfs_atomic_read(&exp->exp_rpc_count) > 0); \ + LASSERT_ATOMIC_POS(&exp->exp_rpc_count); \ cfs_atomic_dec(&(exp)->exp_rpc_count); \ CDEBUG(D_INFO, "RPC PUTting export %p : new rpc_count %d\n", \ (exp), cfs_atomic_read(&(exp)->exp_rpc_count)); \ @@ -221,7 +231,7 @@ extern void (*class_export_dump_hook)(struct obd_export *); #define class_export_lock_put(exp, lock) \ ({ \ - LASSERT(cfs_atomic_read(&exp->exp_locks_count) > 0); \ + LASSERT_ATOMIC_POS(&exp->exp_locks_count); \ 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", \ @@ -239,7 +249,7 @@ extern void (*class_export_dump_hook)(struct obd_export *); #define class_export_cb_put(exp) \ ({ \ - LASSERT(cfs_atomic_read(&exp->exp_cb_count) > 0); \ + LASSERT_ATOMIC_POS(&exp->exp_cb_count); \ 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)); \ @@ -616,6 +626,31 @@ static inline int obd_cleanup(struct obd_device *obd) RETURN(rc); } +static inline void obd_cleanup_client_import(struct obd_device *obd) +{ + ENTRY; + + /* If we set up but never connected, the + client import will not have been cleaned. */ + cfs_down_write(&obd->u.cli.cl_sem); + if (obd->u.cli.cl_import) { + struct obd_import *imp; + imp = obd->u.cli.cl_import; + CDEBUG(D_CONFIG, "%s: client import never connected\n", + obd->obd_name); + ptlrpc_invalidate_import(imp); + if (imp->imp_rq_pool) { + ptlrpc_free_rq_pool(imp->imp_rq_pool); + imp->imp_rq_pool = NULL; + } + class_destroy_import(imp); + obd->u.cli.cl_import = NULL; + } + cfs_up_write(&obd->u.cli.cl_sem); + + EXIT; +} + static inline int obd_process_config(struct obd_device *obd, int datalen, void *data) { @@ -917,11 +952,11 @@ static inline struct obd_uuid *obd_get_uuid(struct obd_export *exp) static inline int obd_connect(const struct lu_env *env, struct obd_export **exp,struct obd_device *obd, struct obd_uuid *cluuid, - struct obd_connect_data *d, + struct obd_connect_data *data, void *localdata) { int rc; - __u64 ocf = d ? d->ocd_connect_flags : 0; /* for post-condition + __u64 ocf = data ? data->ocd_connect_flags : 0; /* for post-condition * check */ ENTRY; @@ -929,10 +964,10 @@ static inline int obd_connect(const struct lu_env *env, OBD_CHECK_DT_OP(obd, connect, -EOPNOTSUPP); OBD_COUNTER_INCREMENT(obd, connect); - rc = OBP(obd, connect)(env, exp, obd, cluuid, d, localdata); + rc = OBP(obd, connect)(env, exp, obd, cluuid, data, localdata); /* check that only subset is granted */ - LASSERT(ergo(d != NULL, - (d->ocd_connect_flags & ocf) == d->ocd_connect_flags)); + LASSERT(ergo(data != NULL, (data->ocd_connect_flags & ocf) == + data->ocd_connect_flags)); RETURN(rc); } @@ -1252,9 +1287,30 @@ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs, RETURN(rc); } -static inline int obd_sync(struct obd_export *exp, struct obdo *oa, - struct lov_stripe_md *ea, obd_size start, - obd_size end, void *capa) +static inline int obd_sync_rqset(struct obd_export *exp, struct obd_info *oinfo, + obd_size start, obd_size end) +{ + struct ptlrpc_request_set *set = NULL; + int rc; + ENTRY; + + OBD_CHECK_DT_OP(exp->exp_obd, sync, -EOPNOTSUPP); + EXP_COUNTER_INCREMENT(exp, sync); + + set = ptlrpc_prep_set(); + if (set == NULL) + RETURN(-ENOMEM); + + rc = OBP(exp->exp_obd, sync)(exp, oinfo, start, end, set); + if (rc == 0) + rc = ptlrpc_set_wait(set); + ptlrpc_set_destroy(set); + RETURN(rc); +} + +static inline int obd_sync(struct obd_export *exp, struct obd_info *oinfo, + obd_size start, obd_size end, + struct ptlrpc_request_set *set) { int rc; ENTRY; @@ -1262,7 +1318,7 @@ static inline int obd_sync(struct obd_export *exp, struct obdo *oa, OBD_CHECK_DT_OP(exp->exp_obd, sync, -EOPNOTSUPP); EXP_COUNTER_INCREMENT(exp, sync); - rc = OBP(exp->exp_obd, sync)(exp, oa, ea, start, end, capa); + rc = OBP(exp->exp_obd, sync)(exp, oinfo, start, end, set); RETURN(rc); } @@ -1978,14 +2034,15 @@ static inline int md_sync(struct obd_export *exp, const struct lu_fid *fid, static inline int md_readpage(struct obd_export *exp, const struct lu_fid *fid, struct obd_capa *oc, __u64 offset, - struct page *page, + struct page **pages, unsigned npages, struct ptlrpc_request **request) { int rc; ENTRY; EXP_CHECK_MD_OP(exp, readpage); EXP_MD_COUNTER_INCREMENT(exp, readpage); - rc = MDP(exp->exp_obd, readpage)(exp, fid, oc, offset, page, request); + rc = MDP(exp->exp_obd, readpage)(exp, fid, oc, offset, pages, npages, + request); RETURN(rc); } @@ -2229,6 +2286,7 @@ void class_uuid_unparse(class_uuid_t in, struct obd_uuid *out); int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index); int class_add_uuid(const char *uuid, __u64 nid); int class_del_uuid (const char *uuid); +int class_check_uuid(struct obd_uuid *uuid, __u64 nid); void class_init_uuidlist(void); void class_exit_uuidlist(void);