X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fobd_class.h;h=6427f4f54ce06823b11e58ccd809f88306fa8f8a;hp=fa44819823383d6d7f9c7cf986e7e7cd2fbc0f26;hb=8ea6a840e00e40220ab769ec329e10f0ad190c09;hpb=665e36b780faa2144cecccd29a0d8a8196a76903 diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h index fa44819..6427f4f 100644 --- a/lustre/include/obd_class.h +++ b/lustre/include/obd_class.h @@ -26,7 +26,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -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; @@ -75,29 +76,50 @@ int class_register_type(struct obd_ops *, struct md_ops *, struct lu_device_type *ldt); int class_unregister_type(const char *nm); -struct obd_device *class_newdev(const char *type_name, const char *name); + + + +/** + allocate one minor number + */ +int obd_minor_alloc(void); +/** + release allocated minor + */ +void obd_minor_release(long minor); +/** + return 1 if minor is point to allocated device, + return 0 otherwise + */ +int obd_minor_valid(long minor); + +int obd_hashes_init(void); +void obd_hashes_fini(void); + +struct obd_device *class_newdev(const char *type_name, const char *name, + const char *uuid); void class_release_dev(struct obd_device *obd); int class_name2dev(const char *name); struct obd_device *class_name2obd(const char *name); int class_uuid2dev(struct obd_uuid *uuid); struct obd_device *class_uuid2obd(struct obd_uuid *uuid); + void class_obd_list(void); +void obd_devlist_first(struct obd_device **pos); +void obd_devlist_next(struct obd_device **pos); +void obd_devlist_last(struct obd_device *pos); +const char *obd_dev_status(struct obd_device *obd); + struct obd_device * class_find_client_obd(struct obd_uuid *tgt_uuid, const char * typ_name, struct obd_uuid *grp_uuid); -struct obd_device * class_find_client_notype(struct obd_uuid *tgt_uuid, - struct obd_uuid *grp_uuid); struct obd_device * class_devices_in_group(struct obd_uuid *grp_uuid, - int *next); -struct obd_device * class_num2obd(int num); + struct obd_device **prev); +struct obd_device * class_num2obd(__u32 num); + -int oig_init(struct obd_io_group **oig); -int oig_add_one(struct obd_io_group *oig, struct oig_callback_context *occ); -void oig_complete_one(struct obd_io_group *oig, - struct oig_callback_context *occ, int rc); -void oig_release(struct obd_io_group *oig); -int oig_wait(struct obd_io_group *oig); +int class_notify_sptlrpc_conf(const char *fsname, int namelen); char *obd_export_nid2str(struct obd_export *exp); @@ -107,6 +129,13 @@ int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid); int obd_zombie_impexp_init(void); 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); +int kuc_len(int payload_len); +struct kuc_hdr * kuc_ptr(void *p); +int kuc_ispayload(void *p); +void *kuc_alloc(int payload_len, int transport, int type); +void kuc_free(void *p, int payload_len); /* obd_config.c */ int class_process_config(struct lustre_cfg *lcfg); @@ -116,8 +145,11 @@ int class_attach(struct lustre_cfg *lcfg); int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg); int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg); int class_detach(struct obd_device *obd, struct lustre_cfg *lcfg); -struct obd_device *class_incref(struct obd_device *obd); -void class_decref(struct obd_device *obd); +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, int locks); /*obdecho*/ #ifdef LPROCFS @@ -138,6 +170,7 @@ 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; struct super_block *cfg_sb; struct obd_uuid cfg_uuid; int cfg_last_idx; /* for partial llog processing */ @@ -150,18 +183,22 @@ 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 obd_export *cld_mgcexp; - unsigned int cld_stopping:1, /* we were told to stop watching */ - cld_lostlock:1; /* lock not requeued */ + 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; + cfs_mutex_t cld_lock; + 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; @@ -171,43 +208,75 @@ 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_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), atomic_read(&(exp)->exp_rpc_count)); \ + (exp), cfs_atomic_read(&(exp)->exp_rpc_count)); \ class_export_put(exp); \ }) -/* genops.c */ -#define class_export_get(exp) \ -({ \ - struct obd_export *exp_ = exp; \ - atomic_inc(&exp_->exp_refcount); \ - CDEBUG(D_INFO, "GETting export %p : new refcount %d\n", exp_, \ - atomic_read(&exp_->exp_refcount)); \ - 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_put(exp) \ -do { \ - LASSERT((exp) != NULL); \ - CDEBUG(D_INFO, "PUTting export %p : new refcount %d\n", (exp), \ - atomic_read(&(exp)->exp_refcount) - 1); \ - LASSERT(atomic_read(&(exp)->exp_refcount) > 0); \ - LASSERT(atomic_read(&(exp)->exp_refcount) < 0x5a5a5a); \ - __class_export_put(exp); \ -} while (0) +#define class_export_lock_put(exp, lock) \ +({ \ + 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", \ + (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_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)); \ + class_export_put(exp); \ +}) -void __class_export_put(struct obd_export *); +/* genops.c */ +struct obd_export *class_export_get(struct obd_export *exp); +void class_export_put(struct obd_export *exp); struct obd_export *class_new_export(struct obd_device *obddev, struct obd_uuid *cluuid); void class_unlink_export(struct obd_export *exp); @@ -224,10 +293,30 @@ 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_disconnect_stale_exports(struct obd_device *, - int (*test_export)(struct obd_export *)); int class_manual_cleanup(struct obd_device *obd); +void class_disconnect_stale_exports(struct obd_device *, + int (*test_export)(struct obd_export *)); +static inline enum obd_option exp_flags_from_obd(struct obd_device *obd) +{ + return ((obd->obd_fail ? OBD_OPT_FAILOVER : 0) | + (obd->obd_force ? OBD_OPT_FORCE : 0) | + (obd->obd_abort_recovery ? OBD_OPT_ABORT_RECOV : 0) | + 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); @@ -327,6 +416,20 @@ do { \ #define EXP_MD_COUNTER_INCREMENT(exp, op) #endif +static inline int lprocfs_nid_ldlm_stats_init(struct nid_stat* tmp) +{ + /* Always add in ldlm_stats */ + tmp->nid_ldlm_stats = lprocfs_alloc_stats(LDLM_LAST_OPC - LDLM_FIRST_OPC + ,LPROCFS_STATS_FLAG_NOPERCPU); + if (tmp->nid_ldlm_stats == NULL) + return -ENOMEM; + + lprocfs_init_ldlm_stats(tmp->nid_ldlm_stats); + + return lprocfs_register_stats(tmp->nid_proc, "ldlm_stats", + tmp->nid_ldlm_stats); +} + #define OBD_CHECK_MD_OP(obd, op, err) \ do { \ if (!OBT(obd) || !MDP((obd), op)) { \ @@ -393,11 +496,6 @@ do { \ } \ } while (0) -static inline int class_devno_max(void) -{ - return MAX_OBD_DEVICES; -} - static inline int obd_get_info(struct obd_export *exp, __u32 keylen, void *key, __u32 *vallen, void *val, struct lov_stripe_md *lsm) @@ -427,27 +525,45 @@ static inline int obd_set_info_async(struct obd_export *exp, obd_count keylen, RETURN(rc); } -#ifdef __KERNEL__ +/* + * obd-lu integration. + * + * Functionality is being moved into new lu_device-based layering, but some + * pieces of configuration process are still based on obd devices. + * + * Specifically, lu_device_type_operations::ldto_device_alloc() methods fully + * subsume ->o_setup() methods of obd devices they replace. The same for + * lu_device_operations::ldo_process_config() and ->o_process_config(). As a + * result, obd_setup() and obd_process_config() branch and call one XOR + * another. + * + * Yet neither lu_device_type_operations::ldto_device_fini() nor + * lu_device_type_operations::ldto_device_free() fully implement the + * functionality of ->o_precleanup() and ->o_cleanup() they override. Hence, + * obd_precleanup() and obd_cleanup() call both lu_device and obd operations. + */ + #define DECLARE_LU_VARS(ldt, d) \ - struct lu_device_type *ldt; \ + struct lu_device_type *ldt; \ struct lu_device *d -#else -#define DECLARE_LU_VARS(ldt, d) \ - extern void __placeholder_to_put_a_semicolon(void) -#endif + static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg) { int rc; DECLARE_LU_VARS(ldt, d); ENTRY; -#ifdef __KERNEL__ ldt = obd->obd_type->typ_lu; if (ldt != NULL) { + struct lu_context session_ctx; struct lu_env env; + lu_context_init(&session_ctx, LCT_SESSION); + session_ctx.lc_thread = NULL; + lu_context_enter(&session_ctx); - rc = lu_env_init(&env, NULL, ldt->ldt_ctx_tags); + rc = lu_env_init(&env, ldt->ldt_ctx_tags); if (rc == 0) { + env.le_ses = &session_ctx; d = ldt->ldt_ops->ldto_device_alloc(&env, ldt, cfg); lu_env_fini(&env); if (!IS_ERR(d)) { @@ -457,9 +573,10 @@ static inline int obd_setup(struct obd_device *obd, struct lustre_cfg *cfg) } else rc = PTR_ERR(d); } - } else -#endif - { + lu_context_exit(&session_ctx); + lu_context_fini(&session_ctx); + + } else { OBD_CHECK_DT_OP(obd, setup, -EOPNOTSUPP); OBD_COUNTER_INCREMENT(obd, setup); rc = OBP(obd, setup)(obd, cfg); @@ -475,30 +592,23 @@ static inline int obd_precleanup(struct obd_device *obd, ENTRY; OBD_CHECK_DEV(obd); -#ifdef __KERNEL__ ldt = obd->obd_type->typ_lu; d = obd->obd_lu_dev; - if (ldt != NULL) { - LASSERT(d != NULL); + if (ldt != NULL && d != NULL) { if (cleanup_stage == OBD_CLEANUP_EXPORTS) { struct lu_env env; - rc = lu_env_init(&env, NULL, ldt->ldt_ctx_tags); + rc = lu_env_init(&env, ldt->ldt_ctx_tags); if (rc == 0) { ldt->ldt_ops->ldto_device_fini(&env, d); lu_env_fini(&env); } - } else { - rc = 0; } - } else -#endif - { - OBD_CHECK_DT_OP(obd, precleanup, 0); - rc = OBP(obd, precleanup)(obd, cleanup_stage); } - + OBD_CHECK_DT_OP(obd, precleanup, 0); OBD_COUNTER_INCREMENT(obd, precleanup); + + rc = OBP(obd, precleanup)(obd, cleanup_stage); RETURN(rc); } @@ -510,26 +620,22 @@ static inline int obd_cleanup(struct obd_device *obd) OBD_CHECK_DEV(obd); -#ifdef __KERNEL__ ldt = obd->obd_type->typ_lu; d = obd->obd_lu_dev; - if (ldt != NULL) { + if (ldt != NULL && d != NULL) { struct lu_env env; - LASSERT(d != NULL); - rc = lu_env_init(&env, NULL, ldt->ldt_ctx_tags); + rc = lu_env_init(&env, ldt->ldt_ctx_tags); if (rc == 0) { ldt->ldt_ops->ldto_device_free(&env, d); lu_env_fini(&env); obd->obd_lu_dev = NULL; } - } else -#endif - { - OBD_CHECK_DT_OP(obd, cleanup, 0); - rc = OBP(obd, cleanup)(obd); } + OBD_CHECK_DT_OP(obd, cleanup, 0); OBD_COUNTER_INCREMENT(obd, cleanup); + + rc = OBP(obd, cleanup)(obd); RETURN(rc); } @@ -542,24 +648,23 @@ obd_process_config(struct obd_device *obd, int datalen, void *data) OBD_CHECK_DEV(obd); -#ifdef __KERNEL__ + obd->obd_process_conf = 1; ldt = obd->obd_type->typ_lu; d = obd->obd_lu_dev; if (ldt != NULL && d != NULL) { struct lu_env env; - rc = lu_env_init(&env, NULL, ldt->ldt_ctx_tags); + rc = lu_env_init(&env, ldt->ldt_ctx_tags); if (rc == 0) { rc = d->ld_ops->ldo_process_config(&env, d, data); lu_env_fini(&env); } - } else -#endif - { + } else { OBD_CHECK_DT_OP(obd, process_config, -EOPNOTSUPP); rc = OBP(obd, process_config)(obd, datalen, data); } OBD_COUNTER_INCREMENT(obd, process_config); + obd->obd_process_conf = 0; RETURN(rc); } @@ -642,34 +747,39 @@ static inline int obd_alloc_memmd(struct obd_export *exp, static inline int obd_free_memmd(struct obd_export *exp, struct lov_stripe_md **mem_tgt) { + int rc; + LASSERT(mem_tgt); LASSERT(*mem_tgt); - return obd_unpackmd(exp, mem_tgt, NULL, 0); + rc = obd_unpackmd(exp, mem_tgt, NULL, 0); + *mem_tgt = NULL; + return rc; } -static inline int obd_checkmd(struct obd_export *exp, - struct obd_export *md_exp, - struct lov_stripe_md *mem_tgt) +static inline int obd_precreate(struct obd_export *exp) { int rc; ENTRY; - EXP_CHECK_DT_OP(exp, checkmd); - EXP_COUNTER_INCREMENT(exp, checkmd); + EXP_CHECK_DT_OP(exp, precreate); + OBD_COUNTER_INCREMENT(exp->exp_obd, precreate); - rc = OBP(exp->exp_obd, checkmd)(exp, md_exp, mem_tgt); + rc = OBP(exp->exp_obd, precreate)(exp); RETURN(rc); } -static inline int obd_precreate(struct obd_export *exp) +static inline int obd_create_async(struct obd_export *exp, + struct obd_info *oinfo, + struct lov_stripe_md **ea, + struct obd_trans_info *oti) { int rc; ENTRY; - EXP_CHECK_DT_OP(exp, precreate); - OBD_COUNTER_INCREMENT(exp->exp_obd, precreate); + EXP_CHECK_DT_OP(exp, create_async); + EXP_COUNTER_INCREMENT(exp, create_async); - rc = OBP(exp->exp_obd, precreate)(exp); + rc = OBP(exp->exp_obd, create_async)(exp, oinfo, ea, oti); RETURN(rc); } @@ -690,7 +800,7 @@ static inline int obd_create(struct obd_export *exp, struct obdo *obdo, static inline int obd_destroy(struct obd_export *exp, struct obdo *obdo, struct lov_stripe_md *ea, struct obd_trans_info *oti, - struct obd_export *md_exp) + struct obd_export *md_exp, void *capa) { int rc; ENTRY; @@ -698,7 +808,7 @@ static inline int obd_destroy(struct obd_export *exp, struct obdo *obdo, EXP_CHECK_DT_OP(exp, destroy); EXP_COUNTER_INCREMENT(exp, destroy); - rc = OBP(exp->exp_obd, destroy)(exp, obdo, ea, oti, md_exp); + rc = OBP(exp->exp_obd, destroy)(exp, obdo, ea, oti, md_exp, capa); RETURN(rc); } @@ -822,24 +932,27 @@ static inline struct obd_uuid *obd_get_uuid(struct obd_export *exp) RETURN(uuid); } +/** Create a new /a exp on device /a obd for the uuid /a cluuid + * @param exp New export handle + * @param d Connect data, supported flags are set, flags also understood + * by obd are returned. + */ static inline int obd_connect(const struct lu_env *env, - struct lustre_handle *conn,struct obd_device *obd, + struct obd_export **exp,struct obd_device *obd, struct obd_uuid *cluuid, struct obd_connect_data *d, void *localdata) { int rc; -#ifdef LIBCFS_DEBUG __u64 ocf = d ? d->ocd_connect_flags : 0; /* for post-condition * check */ -#endif ENTRY; OBD_CHECK_DEV_ACTIVE(obd); OBD_CHECK_DT_OP(obd, connect, -EOPNOTSUPP); OBD_COUNTER_INCREMENT(obd, connect); - rc = OBP(obd, connect)(env, conn, obd, cluuid, d, localdata); + rc = OBP(obd, connect)(env, exp, obd, cluuid, d, localdata); /* check that only subset is granted */ LASSERT(ergo(d != NULL, (d->ocd_connect_flags & ocf) == d->ocd_connect_flags)); @@ -850,13 +963,12 @@ static inline int obd_reconnect(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 *d, + void *localdata) { int rc; -#ifdef LIBCFS_DEBUG __u64 ocf = d ? d->ocd_connect_flags : 0; /* for post-condition * check */ -#endif ENTRY; @@ -864,7 +976,7 @@ static inline int obd_reconnect(const struct lu_env *env, OBD_CHECK_DT_OP(obd, reconnect, 0); OBD_COUNTER_INCREMENT(obd, reconnect); - rc = OBP(obd, reconnect)(env, exp, obd, cluuid, d); + rc = OBP(obd, reconnect)(env, exp, obd, cluuid, d, localdata); /* check that only subset is granted */ LASSERT(ergo(d != NULL, (d->ocd_connect_flags & ocf) == d->ocd_connect_flags)); @@ -994,6 +1106,26 @@ static inline int obd_pool_rem(struct obd_device *obd, char *poolname, char *ost RETURN(rc); } +static inline void obd_getref(struct obd_device *obd) +{ + ENTRY; + if (OBT(obd) && OBP(obd, getref)) { + OBD_COUNTER_INCREMENT(obd, getref); + OBP(obd, getref)(obd); + } + EXIT; +} + +static inline void obd_putref(struct obd_device *obd) +{ + ENTRY; + if (OBT(obd) && OBP(obd, putref)) { + OBD_COUNTER_INCREMENT(obd, putref); + OBP(obd, putref)(obd); + } + EXIT; +} + static inline int obd_init_export(struct obd_export *exp) { int rc = 0; @@ -1046,10 +1178,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. */ @@ -1077,9 +1205,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); @@ -1129,10 +1257,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 @@ -1140,16 +1268,37 @@ 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); } -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; @@ -1157,7 +1306,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); } @@ -1217,233 +1366,9 @@ static inline int obd_brw(int cmd, struct obd_export *exp, RETURN(rc); } -static inline int obd_brw_async(int cmd, struct obd_export *exp, - struct obd_info *oinfo, obd_count oa_bufs, - struct brw_page *pg, struct obd_trans_info *oti, - struct ptlrpc_request_set *set) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, brw_async); - EXP_COUNTER_INCREMENT(exp, brw_async); - - 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_async)(cmd, exp, oinfo, oa_bufs, pg,oti,set); - RETURN(rc); -} - -static inline int obd_brw_rqset(int cmd, struct obd_export *exp, - struct obdo *oa, struct lov_stripe_md *lsm, - obd_count oa_bufs, struct brw_page *pg, - struct obd_trans_info *oti, - struct obd_capa *ocapa) -{ - struct ptlrpc_request_set *set = NULL; - struct obd_info oinfo = { { { 0 } } }; - int rc = 0; - ENTRY; - - set = ptlrpc_prep_set(); - if (set == NULL) - RETURN(-ENOMEM); - - oinfo.oi_oa = oa; - oinfo.oi_md = lsm; - oinfo.oi_capa = ocapa; - rc = obd_brw_async(cmd, exp, &oinfo, oa_bufs, pg, oti, set); - if (rc == 0) { - rc = ptlrpc_set_wait(set); - if (rc) - CERROR("error from callback: rc = %d\n", rc); - } else { - CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR, - "error from obd_brw_async: rc = %d\n", rc); - } - ptlrpc_set_destroy(set); - RETURN(rc); -} - -static inline int obd_prep_async_page(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, - cfs_page_t *page, obd_off offset, - struct obd_async_page_ops *ops, - void *data, void **res, int nocache, - struct lustre_handle *lockh) -{ - int ret; - ENTRY; - - EXP_CHECK_DT_OP(exp, prep_async_page); - EXP_COUNTER_INCREMENT(exp, prep_async_page); - - ret = OBP(exp->exp_obd, prep_async_page)(exp, lsm, loi, page, offset, - ops, data, res, nocache, - lockh); - RETURN(ret); -} - -/** - * Checks if requested extent lock is compatible with a lock under the page. - * - * Checks if the lock under \a page is compatible with a read or write lock - * (specified by \a rw) for an extent [\a start , \a end]. - * - * \param exp obd export (lov or osc) - * \param lsm striping information for the file - * \param res async_page placeholder - * \param rw OBD_BRW_READ if requested for reading, - * OBD_BRW_WRITE if requested for writing - * \param start start of the requested extent - * \param end end of the requested extent - * \param cookie transparent parameter for passing locking context - * - * \post result == 1, *cookie == context, appropriate lock is referenced or - * - * \retval 1 owned lock is reused for the request - * \retval 0 no lock reused for the request - * \retval -ENOTSUPP reget_short_lock is not exported at this layer - * - * \see obd_release_short_lock - */ -static inline int obd_reget_short_lock(struct obd_export *exp, - struct lov_stripe_md *lsm, - void **res, int rw, - obd_off start, obd_off end, - void **cookie) -{ - ENTRY; - - EXP_CHECK_DT_OP(exp, reget_short_lock); - EXP_COUNTER_INCREMENT(exp, reget_short_lock); - - RETURN(OBP(exp->exp_obd, reget_short_lock)(exp, lsm, res, rw, - start, end, cookie)); -} - - -/** - * Releases a reference to a lock taken in a "fast" way. - * - * Releases a read or write (specified by \a rw) lock - * referenced by \a cookie. - * - * \param exp obd export (lov or osc) - * \param lsm striping information for the file - * \param end end of the locked extent - * \param rw OBD_BRW_READ if requested for reading, - * OBD_BRW_WRITE if requested for writing - * \param cookie transparent parameter for passing locking context - * - * \post appropriate lock is dereferenced - * - * \see obd_reget_short_lock - */ -static inline int obd_release_short_lock(struct obd_export *exp, - struct lov_stripe_md *lsm, obd_off end, - void *cookie, int rw) -{ - ENTRY; - - EXP_CHECK_DT_OP(exp, release_short_lock); - EXP_COUNTER_INCREMENT(exp, release_short_lock); - - RETURN(OBP(exp->exp_obd, release_short_lock)(exp, lsm, end, - cookie, rw)); -} - -static inline int obd_queue_async_io(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, void *cookie, - int cmd, obd_off off, int count, - obd_flag brw_flags, obd_flag async_flags) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, queue_async_io); - EXP_COUNTER_INCREMENT(exp, queue_async_io); - LASSERT(cmd & OBD_BRW_RWMASK); - - rc = OBP(exp->exp_obd, queue_async_io)(exp, lsm, loi, cookie, cmd, off, - count, brw_flags, async_flags); - RETURN(rc); -} - -static inline int obd_set_async_flags(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, void *cookie, - obd_flag async_flags) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, set_async_flags); - EXP_COUNTER_INCREMENT(exp, set_async_flags); - - rc = OBP(exp->exp_obd, set_async_flags)(exp, lsm, loi, cookie, - async_flags); - RETURN(rc); -} - -static inline int obd_queue_group_io(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, - struct obd_io_group *oig, - void *cookie, int cmd, obd_off off, - int count, obd_flag brw_flags, - obd_flag async_flags) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, queue_group_io); - EXP_COUNTER_INCREMENT(exp, queue_group_io); - LASSERT(cmd & OBD_BRW_RWMASK); - - rc = OBP(exp->exp_obd, queue_group_io)(exp, lsm, loi, oig, cookie, - cmd, off, count, brw_flags, - async_flags); - RETURN(rc); -} - -static inline int obd_trigger_group_io(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, - struct obd_io_group *oig) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, trigger_group_io); - EXP_COUNTER_INCREMENT(exp, trigger_group_io); - - rc = OBP(exp->exp_obd, trigger_group_io)(exp, lsm, loi, oig); - RETURN(rc); -} - -static inline int obd_teardown_async_page(struct obd_export *exp, - struct lov_stripe_md *lsm, - struct lov_oinfo *loi, void *cookie) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, teardown_async_page); - EXP_COUNTER_INCREMENT(exp, teardown_async_page); - - rc = OBP(exp->exp_obd, teardown_async_page)(exp, lsm, loi, cookie); - RETURN(rc); -} - static inline int obd_preprw(int cmd, struct obd_export *exp, struct obdo *oa, int objcount, struct obd_ioobj *obj, - int niocount, struct niobuf_remote *remote, + struct niobuf_remote *remote, int *pages, struct niobuf_local *local, struct obd_trans_info *oti, struct lustre_capa *capa) @@ -1454,14 +1379,15 @@ static inline int obd_preprw(int cmd, struct obd_export *exp, struct obdo *oa, EXP_CHECK_DT_OP(exp, preprw); EXP_COUNTER_INCREMENT(exp, preprw); - rc = OBP(exp->exp_obd, preprw)(cmd, exp, oa, objcount, obj, niocount, - remote, local, oti, capa); + rc = OBP(exp->exp_obd, preprw)(cmd, exp, oa, objcount, obj, remote, + pages, local, oti, capa); RETURN(rc); } static inline int obd_commitrw(int cmd, struct obd_export *exp, struct obdo *oa, int objcount, struct obd_ioobj *obj, - int niocount, struct niobuf_local *local, + struct niobuf_remote *rnb, int pages, + struct niobuf_local *local, struct obd_trans_info *oti, int rc) { ENTRY; @@ -1469,8 +1395,8 @@ static inline int obd_commitrw(int cmd, struct obd_export *exp, struct obdo *oa, EXP_CHECK_DT_OP(exp, commitrw); EXP_COUNTER_INCREMENT(exp, commitrw); - rc = OBP(exp->exp_obd, commitrw)(cmd, exp, oa, objcount, obj, niocount, - local, oti, rc); + rc = OBP(exp->exp_obd, commitrw)(cmd, exp, oa, objcount, obj, + rnb, pages, local, oti, rc); RETURN(rc); } @@ -1552,32 +1478,31 @@ static inline int obd_enqueue(struct obd_export *exp, RETURN(rc); } -static inline int obd_match(struct obd_export *exp, struct lov_stripe_md *ea, - __u32 type, ldlm_policy_data_t *policy, __u32 mode, - int *flags, void *data, struct lustre_handle *lockh) +static inline int obd_change_cbdata(struct obd_export *exp, + struct lov_stripe_md *lsm, + ldlm_iterator_t it, void *data) { int rc; ENTRY; - EXP_CHECK_DT_OP(exp, match); - EXP_COUNTER_INCREMENT(exp, match); + EXP_CHECK_DT_OP(exp, change_cbdata); + EXP_COUNTER_INCREMENT(exp, change_cbdata); - rc = OBP(exp->exp_obd, match)(exp, ea, type, policy, mode, flags, data, - lockh); + rc = OBP(exp->exp_obd, change_cbdata)(exp, lsm, it, data); RETURN(rc); } -static inline int obd_change_cbdata(struct obd_export *exp, - struct lov_stripe_md *lsm, - ldlm_iterator_t it, void *data) +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, change_cbdata); - EXP_COUNTER_INCREMENT(exp, change_cbdata); + EXP_CHECK_DT_OP(exp, find_cbdata); + EXP_COUNTER_INCREMENT(exp, find_cbdata); - rc = OBP(exp->exp_obd, change_cbdata)(exp, lsm, it, data); + rc = OBP(exp->exp_obd, find_cbdata)(exp, lsm, it, data); RETURN(rc); } @@ -1597,7 +1522,8 @@ static inline int obd_cancel(struct obd_export *exp, static inline int obd_cancel_unused(struct obd_export *exp, struct lov_stripe_md *ea, - int flags, void *opaque) + ldlm_cancel_flags_t flags, + void *opaque) { int rc; ENTRY; @@ -1609,19 +1535,6 @@ static inline int obd_cancel_unused(struct obd_export *exp, RETURN(rc); } -static inline int obd_join_lru(struct obd_export *exp, - struct lov_stripe_md *ea, int join) -{ - int rc; - ENTRY; - - EXP_CHECK_DT_OP(exp, join_lru); - EXP_COUNTER_INCREMENT(exp, join_lru); - - rc = OBP(exp->exp_obd, join_lru)(exp, ea, join); - RETURN(rc); -} - static inline int obd_pin(struct obd_export *exp, const struct lu_fid *fid, struct obd_capa *oc, struct obd_client_handle *handle, int flag) @@ -1728,7 +1641,8 @@ static inline int obd_notify_observer(struct obd_device *observer, */ onu = &observer->obd_upcall; if (onu->onu_upcall != NULL) - rc2 = onu->onu_upcall(observer, observed, ev, onu->onu_owner); + rc2 = onu->onu_upcall(observer, observed, ev, + onu->onu_owner, NULL); else rc2 = 0; @@ -1744,7 +1658,7 @@ static inline int obd_quotacheck(struct obd_export *exp, EXP_CHECK_DT_OP(exp, quotacheck); EXP_COUNTER_INCREMENT(exp, quotacheck); - rc = OBP(exp->exp_obd, quotacheck)(exp, oqctl); + rc = OBP(exp->exp_obd, quotacheck)(exp->exp_obd, exp, oqctl); RETURN(rc); } @@ -1757,7 +1671,40 @@ static inline int obd_quotactl(struct obd_export *exp, EXP_CHECK_DT_OP(exp, quotactl); EXP_COUNTER_INCREMENT(exp, quotactl); - rc = OBP(exp->exp_obd, quotactl)(exp, oqctl); + rc = OBP(exp->exp_obd, quotactl)(exp->exp_obd, exp, oqctl); + RETURN(rc); +} + +static inline int obd_quota_adjust_qunit(struct obd_export *exp, + struct quota_adjust_qunit *oqaq, + struct lustre_quota_ctxt *qctxt, + struct ptlrpc_request_set *set) +{ +#if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) + struct timeval work_start; + struct timeval work_end; + long timediff; +#endif + int rc; + ENTRY; + +#if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) + if (qctxt) + cfs_gettimeofday(&work_start); +#endif + EXP_CHECK_DT_OP(exp, quota_adjust_qunit); + EXP_COUNTER_INCREMENT(exp, quota_adjust_qunit); + + rc = OBP(exp->exp_obd, quota_adjust_qunit)(exp, oqaq, qctxt, set); + +#if defined(LPROCFS) && defined(HAVE_QUOTA_SUPPORT) + if (qctxt) { + cfs_gettimeofday(&work_end); + timediff = cfs_timeval_sub(&work_end, &work_start, NULL); + lprocfs_counter_add(qctxt->lqc_stats, LQUOTA_ADJUST_QUNIT, + timediff); + } +#endif RETURN(rc); } @@ -1792,12 +1739,38 @@ 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); +} + +#if 0 static inline int obd_register_page_removal_cb(struct obd_export *exp, obd_page_removal_cb_t cb, obd_pin_extent_cb pin_cb) @@ -1850,6 +1823,7 @@ static inline int obd_unregister_lock_cancel_cb(struct obd_export *exp, rc = OBP(exp->exp_obd, unregister_lock_cancel_cb)(exp, cb); RETURN(rc); } +#endif /* metadata helpers */ static inline int md_getstatus(struct obd_export *exp, @@ -1864,16 +1838,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); } @@ -1889,6 +1861,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) @@ -1946,17 +1930,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); } @@ -2134,18 +2115,20 @@ static inline int md_clear_open_replay_data(struct obd_export *exp, } static inline int md_set_lock_data(struct obd_export *exp, - __u64 *lockh, void *data) + __u64 *lockh, void *data, __u32 *bits) { ENTRY; EXP_CHECK_MD_OP(exp, set_lock_data); EXP_MD_COUNTER_INCREMENT(exp, set_lock_data); - RETURN(MDP(exp->exp_obd, set_lock_data)(exp, lockh, data)); + RETURN(MDP(exp->exp_obd, set_lock_data)(exp, lockh, data, bits)); } static inline int md_cancel_unused(struct obd_export *exp, const struct lu_fid *fid, ldlm_policy_data_t *policy, - ldlm_mode_t mode, int flags, void *opaque) + ldlm_mode_t mode, + ldlm_cancel_flags_t flags, + void *opaque) { int rc; ENTRY; @@ -2205,6 +2188,19 @@ static inline int md_renew_capa(struct obd_export *exp, struct obd_capa *ocapa, RETURN(rc); } +static inline int md_unpack_capa(struct obd_export *exp, + struct ptlrpc_request *req, + const struct req_msg_field *field, + struct obd_capa **oc) +{ + int rc; + ENTRY; + EXP_CHECK_MD_OP(exp, unpack_capa); + EXP_MD_COUNTER_INCREMENT(exp, unpack_capa); + rc = MDP(exp->exp_obd, unpack_capa)(exp, req, field, oc); + RETURN(rc); +} + static inline int md_intent_getattr_async(struct obd_export *exp, struct md_enqueue_info *minfo, struct ldlm_enqueue_info *einfo) @@ -2240,7 +2236,7 @@ extern cfs_mem_cache_t *obdo_cachep; #define OBDO_ALLOC(ptr) \ do { \ - OBD_SLAB_ALLOC_PTR((ptr), obdo_cachep); \ + OBD_SLAB_ALLOC_PTR_GFP((ptr), obdo_cachep, CFS_ALLOC_IO); \ } while(0) #define OBDO_FREE(ptr) \ @@ -2285,6 +2281,6 @@ int mea_name2idx(struct lmv_stripe_md *mea, const char *name, int namelen); int raw_name2idx(int hashtype, int count, const char *name, int namelen); /* prng.c */ -void ll_generate_random_uuid(class_uuid_t uuid_out); +#define ll_generate_random_uuid(uuid_out) cfs_get_random_bytes(uuid_out, sizeof(class_uuid_t)) #endif /* __LINUX_OBD_CLASS_H */