X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_internal.h;h=1195605b6af83d5f2bbcd1089489b19f5947961c;hb=342caced07fdaca95d5ab4091e947116738ef69a;hp=d68fe3c5e38dd9c454ec8592d804f3cdcc3c725e;hpb=a1efc1411e2e7b67102d132e656d2a11a99636b3;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index d68fe3c..1195605 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -60,27 +60,17 @@ * struct lustre_handle */ #include +#include +#include #include -#include #include #include #include -/* LR_CLIENT_SIZE, etc. */ -#include #include #include #include #include - -static inline __u64 lcd_last_transno(struct lsd_client_data *lcd) -{ - return max(lcd->lcd_last_transno, lcd->lcd_last_close_transno); -} - -static inline __u64 lcd_last_xid(struct lsd_client_data *lcd) -{ - return max(lcd->lcd_last_xid, lcd->lcd_last_close_xid); -} +#include /* check if request's xid is equal to last one or not*/ static inline int req_xid_is_last(struct ptlrpc_request *req) @@ -119,6 +109,8 @@ struct mdt_device { /* underlying device */ struct md_device *mdt_child; struct dt_device *mdt_bottom; + /** target device */ + struct lu_target mdt_lut; /* * Options bit-fields. */ @@ -127,7 +119,8 @@ struct mdt_device { mo_acl :1, mo_compat_resname:1, mo_mds_capa :1, - mo_oss_capa :1; + mo_oss_capa :1, + mo_cos :1; } mdt_opts; /* mdt state flags */ __u32 mdt_fl_cfglog:1, @@ -136,25 +129,13 @@ struct mdt_device { spinlock_t mdt_ioepoch_lock; __u64 mdt_ioepoch; - /* Transaction related stuff here */ - spinlock_t mdt_transno_lock; - __u64 mdt_last_transno; - /* transaction callbacks */ struct dt_txn_callback mdt_txn_cb; - /* last_rcvd file */ - struct dt_object *mdt_last_rcvd; /* these values should be updated from lov if necessary. * or should be placed somewhere else. */ int mdt_max_mdsize; int mdt_max_cookiesize; - __u64 mdt_mount_count; - - /* last_rcvd data */ - struct lr_server_data mdt_lsd; - spinlock_t mdt_client_bitmap_lock; - unsigned long mdt_client_bitmap[(LR_MAX_CLIENTS >> 3) / sizeof(long)]; struct upcall_cache *mdt_identity_cache; @@ -171,15 +152,34 @@ struct mdt_device { cfs_timer_t mdt_ck_timer; struct ptlrpc_thread mdt_ck_thread; struct lustre_capa_key mdt_capa_keys[2]; - unsigned int mdt_capa_conf:1; + unsigned int mdt_capa_conf:1, + mdt_som_conf:1; + + /* root squash */ + uid_t mdt_squash_uid; + gid_t mdt_squash_gid; + struct list_head mdt_nosquash_nids; + char *mdt_nosquash_str; + int mdt_nosquash_strlen; + struct rw_semaphore mdt_squash_sem; cfs_proc_dir_entry_t *mdt_proc_entry; struct lprocfs_stats *mdt_stats; + int mdt_sec_level; }; -#define MDT_SERVICE_WATCHDOG_FACTOR (2000) +#define mdt_transno_lock mdt_lut.lut_translock +#define mdt_last_transno mdt_lut.lut_last_transno +#define mdt_last_rcvd mdt_lut.lut_last_rcvd +#define mdt_mount_count mdt_lut.lut_mount_count +#define mdt_lsd mdt_lut.lut_lsd +#define mdt_client_bitmap_lock mdt_lut.lut_client_bitmap_lock +#define mdt_client_bitmap mdt_lut.lut_client_bitmap + +#define MDT_SERVICE_WATCHDOG_FACTOR (2) #define MDT_ROCOMPAT_SUPP (OBD_ROCOMPAT_LOVOBJID) #define MDT_INCOMPAT_SUPP (OBD_INCOMPAT_MDT | OBD_INCOMPAT_COMMON_LR) +#define MDT_COS_DEFAULT (1) struct mdt_object { struct lu_object_header mot_header; @@ -310,7 +310,7 @@ struct mdt_thread_info { /* * XXX: Part Three: - * The following members will be filled explictly + * The following members will be filled explicitly * with zero in mdt_reint_unpack(), because they are only used * by reint requests (including mdt_reint_open()). */ @@ -320,6 +320,9 @@ struct mdt_thread_info { */ struct mdt_reint_record mti_rr; + /** md objects included in operation */ + struct mdt_object *mti_mos[PTLRPC_NUM_VERSIONS]; + /* * Operation specification (currently create and lookup) */ @@ -367,8 +370,14 @@ struct mdt_thread_info { /* Ops object filename */ struct lu_name mti_name; + struct md_attr mti_tmp_attr; }; +#define mti_parent mti_mos[0] +#define mti_child mti_mos[1] +#define mti_parent1 mti_mos[2] +#define mti_child1 mti_mos[3] + typedef void (*mdt_cb_t)(const struct mdt_device *mdt, __u64 transno, void *data, int err); struct mdt_commit_cb { @@ -376,6 +385,11 @@ struct mdt_commit_cb { void *mdt_cb_data; }; +enum mdt_txn_op { + MDT_TXN_CAPA_KEYS_WRITE_OP, + MDT_TXN_LAST_RCVD_WRITE_OP, +}; + /* * Info allocated per-transaction. */ @@ -383,22 +397,22 @@ struct mdt_commit_cb { struct mdt_txn_info { __u64 txi_transno; unsigned int txi_cb_count; - struct mdt_commit_cb txi_cb[MDT_MAX_COMMIT_CB]; + struct lut_commit_cb txi_cb[MDT_MAX_COMMIT_CB]; }; extern struct lu_context_key mdt_txn_key; static inline void mdt_trans_add_cb(const struct thandle *th, - mdt_cb_t cb_func, void *cb_data) + lut_cb_t cb_func, void *cb_data) { struct mdt_txn_info *txi; - + txi = lu_context_key_get(&th->th_ctx, &mdt_txn_key); LASSERT(txi->txi_cb_count < ARRAY_SIZE(txi->txi_cb)); /* add new callback */ - txi->txi_cb[txi->txi_cb_count].mdt_cb_func = cb_func; - txi->txi_cb[txi->txi_cb_count].mdt_cb_data = cb_data; + txi->txi_cb[txi->txi_cb_count].lut_cb_func = cb_func; + txi->txi_cb[txi->txi_cb_count].lut_cb_data = cb_data; txi->txi_cb_count++; } @@ -527,10 +541,10 @@ void mdt_reconstruct_generic(struct mdt_thread_info *mti, struct mdt_lock_handle *lhc); extern void target_recovery_fini(struct obd_device *obd); -extern void target_recovery_init(struct obd_device *obd, +extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler); int mdt_fs_setup(const struct lu_env *, struct mdt_device *, - struct obd_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, @@ -541,6 +555,10 @@ int mdt_client_add(const struct lu_env *env, 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); + int mdt_pin(struct mdt_thread_info* info); int mdt_lock_new_child(struct mdt_thread_info *info, @@ -571,8 +589,12 @@ void mdt_shrink_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 *); + +void mdt_trans_credit_init(const struct lu_env *env, + struct mdt_device *mdt, + enum mdt_txn_op op); struct thandle* mdt_trans_start(const struct lu_env *env, - struct mdt_device *mdt, int credits); + struct mdt_device *mdt); 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, @@ -591,23 +613,19 @@ int mdt_check_ucred(struct mdt_thread_info *); int mdt_init_ucred(struct mdt_thread_info *, struct mdt_body *); int mdt_init_ucred_reint(struct mdt_thread_info *); void mdt_exit_ucred(struct mdt_thread_info *); +int mdt_version_get_check(struct mdt_thread_info *, int); /* mdt_idmap.c */ +int mdt_init_sec_level(struct mdt_thread_info *); int mdt_init_idmap(struct mdt_thread_info *); - void mdt_cleanup_idmap(struct mdt_export_data *); - int mdt_handle_idmap(struct mdt_thread_info *); - int ptlrpc_user_desc_do_idmap(struct ptlrpc_request *, struct ptlrpc_user_desc *); - void mdt_body_reverse_idmap(struct mdt_thread_info *, struct mdt_body *); - int mdt_remote_perm_reverse_idmap(struct ptlrpc_request *, struct mdt_remote_perm *); - int mdt_fix_attr_ucred(struct mdt_thread_info *, __u32); static inline struct mdt_device *mdt_dev(struct lu_device *d) @@ -676,13 +694,15 @@ static inline int is_identity_get_disabled(struct upcall_cache *cache) return cache ? (strcmp(cache->uc_upcall, "NONE") == 0) : 1; } +int mdt_blocking_ast(struct ldlm_lock*, struct ldlm_lock_desc*, void*, int); + /* Issues dlm lock on passed @ns, @f stores it lock handle into @lh. */ static inline int mdt_fid_lock(struct ldlm_namespace *ns, struct lustre_handle *lh, ldlm_mode_t mode, ldlm_policy_data_t *policy, const struct ldlm_res_id *res_id, - int flags) + int flags, const __u64 *client_cookie) { int rc; @@ -690,9 +710,9 @@ static inline int mdt_fid_lock(struct ldlm_namespace *ns, LASSERT(lh != NULL); rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS, policy, - mode, &flags, ldlm_blocking_ast, - ldlm_completion_ast, NULL, NULL, - 0, NULL, lh); + mode, &flags, mdt_blocking_ast, + ldlm_completion_ast, + NULL, NULL, 0, NULL, client_cookie, lh); return rc == ELDLM_OK ? 0 : -EIO; } @@ -745,6 +765,9 @@ static inline struct lu_name *mdt_name_copy(struct lu_name *tlname, return tlname; } +void mdt_enable_cos(struct mdt_device *, int); +int mdt_cos_is_enabled(struct mdt_device *); + /* lprocfs stuff */ void lprocfs_mdt_init_vars(struct lprocfs_static_vars *lvars); int mdt_procfs_init(struct mdt_device *mdt, const char *name); @@ -767,11 +790,11 @@ static inline void mdt_set_capainfo(struct mdt_thread_info *info, int offset, const struct lu_fid *fid, struct lustre_capa *capa) { - struct mdt_device *dev = info->mti_mdt; struct md_capainfo *ci; LASSERT(offset >= 0 && offset <= MD_CAPAINFO_MAX); - if (!dev->mdt_opts.mo_mds_capa) + if (!info->mti_mdt->mdt_opts.mo_mds_capa || + !(info->mti_exp->exp_connect_flags & OBD_CONNECT_MDS_CAPA)) return; ci = md_capainfo(info->mti_env); @@ -804,5 +827,9 @@ static inline void mdt_dump_capainfo(struct mdt_thread_info *info) } } +static inline struct obd_device *mdt2obd_dev(const struct mdt_device *mdt) +{ + return mdt->mdt_md_dev.md_lu_dev.ld_obd; +} #endif /* __KERNEL__ */ #endif /* _MDT_H */