X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_internal.h;h=b990ba90336ade81da37368a2fdaade8805faaf4;hp=3ab81254e569a71df70974321bcb4556dd4d6186;hb=60a9fd37185edf57fc42bf6a5ad9b9c61fc10e14;hpb=65701b4a30efdb695776bcf690a2b3cabc928da1 diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index 3ab8125..b990ba9 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,6 +71,7 @@ #include #include #include +#include /* check if request's xid is equal to last one or not*/ static inline int req_xid_is_last(struct ptlrpc_request *req) @@ -86,10 +85,10 @@ struct mdt_object; /* file data for open files on MDS */ struct mdt_file_data { struct portals_handle mfd_handle; /* must be first */ + int mfd_mode; /* open mode provided by client */ cfs_list_t mfd_list; /* protected by med_open_lock */ __u64 mfd_xid; /* xid of the open request */ struct lustre_handle mfd_old_handle; /* old handle in replay case */ - int mfd_mode; /* open mode provided by client */ struct mdt_object *mfd_object; /* point to opened object */ }; @@ -100,6 +99,7 @@ struct mdt_file_data { struct mdt_device { /* super-class */ struct md_device mdt_md_dev; + struct md_site mdt_mite; struct ptlrpc_service *mdt_regular_service; struct ptlrpc_service *mdt_readpage_service; struct ptlrpc_service *mdt_xmds_service; @@ -113,8 +113,10 @@ struct mdt_device { /* ptlrpc handle for MDS->client connections (for lock ASTs). */ struct ptlrpc_client *mdt_ldlm_client; /* underlying device */ + struct obd_export *mdt_child_exp; struct md_device *mdt_child; struct dt_device *mdt_bottom; + struct obd_export *mdt_bottom_exp; /** target device */ struct lu_target mdt_lut; /* @@ -131,7 +133,7 @@ struct mdt_device { /* mdt state flags */ unsigned long mdt_state; /* lock to protect IOepoch */ - cfs_spinlock_t mdt_ioepoch_lock; + spinlock_t mdt_ioepoch_lock; __u64 mdt_ioepoch; /* transaction callbacks */ @@ -145,7 +147,7 @@ struct mdt_device { struct upcall_cache *mdt_identity_cache; /* sptlrpc rules */ - cfs_rwlock_t mdt_sptlrpc_lock; + rwlock_t mdt_sptlrpc_lock; struct sptlrpc_rule_set mdt_sptlrpc_rset; /* capability keys */ @@ -160,18 +162,29 @@ struct mdt_device { unsigned int mdt_capa_conf:1, mdt_som_conf:1; + /* statfs optimization: we cache a bit */ + struct obd_statfs mdt_osfs; + __u64 mdt_osfs_age; + spinlock_t mdt_osfs_lock; + /* root squash */ uid_t mdt_squash_uid; gid_t mdt_squash_gid; cfs_list_t mdt_nosquash_nids; char *mdt_nosquash_str; int mdt_nosquash_strlen; - cfs_rw_semaphore_t mdt_squash_sem; + struct rw_semaphore mdt_squash_sem; cfs_proc_dir_entry_t *mdt_proc_entry; struct lprocfs_stats *mdt_stats; int mdt_sec_level; struct rename_stats mdt_rename_stats; + struct lu_fid mdt_md_root_fid; + + /* connection to quota master */ + struct obd_export *mdt_qmt_exp; + /* quota master device associated with this MDT */ + struct lu_device *mdt_qmt_dev; }; #define MDT_SERVICE_WATCHDOG_FACTOR (2) @@ -189,9 +202,9 @@ struct mdt_object { int mot_ioepoch_count; int mot_writecount; /* Lock to protect object's IO epoch. */ - cfs_semaphore_t mot_ioepoch_sem; + struct mutex mot_ioepoch_mutex; /* Lock to protect create_data */ - cfs_semaphore_t mot_lov_sem; + struct mutex mot_lov_mutex; }; enum mdt_object_flags { @@ -323,7 +336,6 @@ struct mdt_thread_info { const struct ldlm_request *mti_dlm_req; __u32 mti_has_trans:1, /* has txn already? */ - mti_no_need_trans:1, mti_cross_ref:1; /* opdata for mdt_reint_open(), has the same as @@ -371,7 +383,7 @@ struct mdt_thread_info { struct obd_uuid uuid[2]; /* for mdt_seq_init_cli() */ char ns_name[48]; /* for mdt_init0() */ struct lustre_cfg_bufs bufs; /* for mdt_stack_fini() */ - cfs_kstatfs_t ksfs; /* for mdt_statfs() */ + struct obd_statfs osfs; /* for mdt_statfs() */ struct { /* for mdt_readpage() */ struct lu_rdpg mti_rdpg; @@ -388,28 +400,19 @@ struct mdt_thread_info { struct mdt_ioepoch *mti_ioepoch; __u64 mti_replayepoch; - /* server and client data buffers */ - struct lr_server_data mti_lsd; - struct lsd_client_data mti_lcd; loff_t mti_off; struct lu_buf mti_buf; struct lustre_capa_key mti_capa_key; /* Ops object filename */ struct lu_name mti_name; - struct md_attr mti_tmp_attr; -}; - -typedef void (*mdt_cb_t)(const struct mdt_device *mdt, __u64 transno, - void *data, int err); -struct mdt_commit_cb { - mdt_cb_t mdt_cb_func; - void *mdt_cb_data; -}; - -enum mdt_txn_op { - MDT_TXN_CAPA_KEYS_WRITE_OP, - MDT_TXN_LAST_RCVD_WRITE_OP, + /* per-thread values, can be re-used */ + void *mti_big_lmm; + int mti_big_lmmsize; + /* big_lmm buffer was used and must be used in reply */ + int mti_big_lmm_used; + /* should be enough to fit lustre_mdt_attrs */ + char mti_xattr_buf[128]; }; static inline const struct md_device_operations * @@ -463,19 +466,24 @@ static inline int mdt_object_exists(const struct mdt_object *o) return lu_object_exists(&o->mot_obj.mo_lu); } -static inline const struct lu_fid *mdt_object_fid(struct mdt_object *o) +static inline const struct lu_fid *mdt_object_fid(const struct mdt_object *o) { return lu_object_fid(&o->mot_obj.mo_lu); } +static inline int mdt_object_obf(const struct mdt_object *o) +{ + return lu_fid_eq(mdt_object_fid(o), &LU_OBF_FID); +} + static inline struct lu_site *mdt_lu_site(const struct mdt_device *mdt) { return mdt->mdt_md_dev.md_lu_dev.ld_site; } -static inline struct md_site *mdt_md_site(const struct mdt_device *mdt) +static inline struct md_site *mdt_md_site(struct mdt_device *mdt) { - return lu_site2md(mdt_lu_site(mdt)); + return &mdt->mdt_mite; } static inline void mdt_export_evict(struct obd_export *exp) @@ -511,6 +519,9 @@ void mdt_object_unlock(struct mdt_thread_info *, struct mdt_lock_handle *, int decref); +struct mdt_object *mdt_object_new(const struct lu_env *, + struct mdt_device *, + const struct lu_fid *); struct mdt_object *mdt_object_find(const struct lu_env *, struct mdt_device *, const struct lu_fid *); @@ -549,14 +560,6 @@ int mdt_fs_setup(const struct lu_env *, struct mdt_device *, struct obd_device *, struct lustre_sb_info *lsi); void mdt_fs_cleanup(const struct lu_env *, struct mdt_device *); -int mdt_client_del(const struct lu_env *env, - struct mdt_device *mdt); -int mdt_client_add(const struct lu_env *env, - struct mdt_device *mdt, - int cl_idx); -int mdt_client_new(const struct lu_env *env, - struct mdt_device *mdt); - int mdt_export_stats_init(struct obd_device *obd, struct obd_export *exp, void *client_nid); @@ -587,6 +590,8 @@ enum { MDT_SOM_ENABLE = 1, }; +int mdt_attr_get_complex(struct mdt_thread_info *info, + struct mdt_object *o, struct md_attr *ma); int mdt_ioepoch_open(struct mdt_thread_info *info, struct mdt_object *o, int created); int mdt_object_is_som_enabled(struct mdt_object *mo); @@ -600,23 +605,11 @@ int mdt_close(struct mdt_thread_info *info); int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo, struct md_attr *ma, int flags); int mdt_done_writing(struct mdt_thread_info *info); -void mdt_shrink_reply(struct mdt_thread_info *info); +int mdt_fix_reply(struct mdt_thread_info *info); int mdt_handle_last_unlink(struct mdt_thread_info *, struct mdt_object *, const struct md_attr *); void mdt_reconstruct_open(struct mdt_thread_info *, struct mdt_lock_handle *); -struct thandle *mdt_trans_create(const struct lu_env *env, - struct mdt_device *mdt); -int mdt_trans_start(const struct lu_env *env, struct mdt_device *mdt, - struct thandle *th); -void mdt_trans_stop(const struct lu_env *env, - struct mdt_device *mdt, struct thandle *th); -int mdt_record_write(const struct lu_env *env, - struct dt_object *dt, const struct lu_buf *buf, - loff_t *pos, struct thandle *th); -int mdt_record_read(const struct lu_env *env, - struct dt_object *dt, struct lu_buf *buf, loff_t *pos); - struct lu_buf *mdt_buf(const struct lu_env *env, void *area, ssize_t len); const struct lu_buf *mdt_buf_const(const struct lu_env *env, const void *area, ssize_t len); @@ -678,15 +671,17 @@ int mdt_pack_remote_perm(struct mdt_thread_info *, struct mdt_object *, void *); extern struct lu_context_key mdt_thread_key; /* debug issues helper starts here*/ -static inline void mdt_fail_write(const struct lu_env *env, - struct dt_device *dd, int id) +static inline int mdt_fail_write(const struct lu_env *env, + struct dt_device *dd, int id) { if (OBD_FAIL_CHECK_ORSET(id, OBD_FAIL_ONCE)) { CERROR(LUSTRE_MDT_NAME": cfs_fail_loc=%x, fail write ops\n", id); - dd->dd_ops->dt_ro(env, dd); + return dd->dd_ops->dt_ro(env, dd); /* We set FAIL_ONCE because we never "un-fail" a device */ } + + return 0; } static inline struct mdt_export_data *mdt_req2med(struct ptlrpc_request *req) @@ -714,7 +709,8 @@ static inline int mdt_check_resent(struct mdt_thread_info *info, RETURN(0); } -struct md_ucred *mdt_ucred(const struct mdt_thread_info *info); +struct lu_ucred *mdt_ucred(const struct mdt_thread_info *info); +struct lu_ucred *mdt_ucred_check(const struct mdt_thread_info *info); static inline int is_identity_get_disabled(struct upcall_cache *cache) { @@ -729,7 +725,7 @@ static inline int mdt_fid_lock(struct ldlm_namespace *ns, ldlm_mode_t mode, ldlm_policy_data_t *policy, const struct ldlm_res_id *res_id, - int flags, const __u64 *client_cookie) + __u64 flags, const __u64 *client_cookie) { int rc; @@ -739,7 +735,7 @@ static inline int mdt_fid_lock(struct ldlm_namespace *ns, rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS, policy, mode, &flags, mdt_blocking_ast, ldlm_completion_ast, NULL, NULL, 0, - client_cookie, lh); + LVB_T_NONE, client_cookie, lh); return rc == ELDLM_OK ? 0 : -EIO; } @@ -764,6 +760,9 @@ static inline ldlm_mode_t mdt_mdl_mode2dlm_mode(mdl_mode_t mode) return mdt_dlm_lock_modes[mode]; } +/* mdt_lvb.c */ +extern struct ldlm_valblock_ops mdt_lvbo; + static inline struct lu_name *mdt_name(const struct lu_env *env, char *name, int namelen) { @@ -816,14 +815,15 @@ enum { LPROC_MDT_CROSSDIR_RENAME, LPROC_MDT_LAST, }; -void mdt_counter_incr(struct obd_export *exp, int opcode); +void mdt_counter_incr(struct ptlrpc_request *req, int opcode); void mdt_stats_counter_init(struct lprocfs_stats *stats); void lprocfs_mdt_init_vars(struct lprocfs_static_vars *lvars); int mdt_procfs_init(struct mdt_device *mdt, const char *name); int mdt_procfs_fini(struct mdt_device *mdt); void mdt_rename_counter_tally(struct mdt_thread_info *info, - struct mdt_device *mdt, struct obd_export *exp, - struct mdt_object *src, struct mdt_object *tgt); + struct mdt_device *mdt, + struct ptlrpc_request *req, + struct mdt_object *src, struct mdt_object *tgt); void mdt_time_start(const struct mdt_thread_info *info); void mdt_time_end(const struct mdt_thread_info *info, int idx); @@ -840,7 +840,7 @@ static inline void mdt_set_capainfo(struct mdt_thread_info *info, int offset, { struct md_capainfo *ci; - LASSERT(offset >= 0 && offset <= MD_CAPAINFO_MAX); + LASSERT(offset >= 0 && offset < MD_CAPAINFO_MAX); if (!info->mti_mdt->mdt_opts.mo_mds_capa || !(info->mti_exp->exp_connect_flags & OBD_CONNECT_MDS_CAPA)) return;