X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_internal.h;h=7b01a832fc718269bee358910cf729175c2d4f5e;hp=89170022684b357f19ab300db72ccb4c0852bea3;hb=32b0004ef1c34347e4d312b9126496db50634ee0;hpb=b500d5193360711a6c6b07497f34e61cc590cf19 diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index 8917002..7b01a83 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -65,7 +65,7 @@ struct mdt_object; /* file data for open files on MDS */ struct mdt_file_data { /** portals handle must be first */ - struct portals_handle mfd_handle; + struct portals_handle mfd_open_handle; /** open mode provided by client */ __u64 mfd_mode; /** protected by med_open_lock */ @@ -73,7 +73,7 @@ struct mdt_file_data { /** xid of the open request */ __u64 mfd_xid; /** old handle in replay case */ - struct lustre_handle mfd_old_handle; + struct lustre_handle mfd_open_handle_old; /** point to opened object */ struct mdt_object *mfd_object; }; @@ -225,7 +225,8 @@ struct mdt_device { mo_acl:1, mo_cos:1, mo_evict_tgt_nids:1, - mo_dom_read_open:1; + mo_dom_read_open:1, + mo_migrate_hsm_allowed:1; unsigned int mo_dom_lock; } mdt_opts; /* mdt state flags */ @@ -350,7 +351,8 @@ enum { struct mdt_reint_record { enum mds_reint_op rr_opcode; - const struct lustre_handle *rr_handle; + const struct lustre_handle *rr_open_handle; + const struct lustre_handle *rr_lease_handle; const struct lu_fid *rr_fid1; const struct lu_fid *rr_fid2; struct lu_name rr_name; @@ -404,7 +406,8 @@ struct mdt_thread_info { /* * Object attributes. */ - struct md_attr mti_attr; + struct md_attr mti_attr; + struct md_attr mti_attr2; /* mdt_lvb.c */ /* * Body for "habeo corpus" operations. */ @@ -480,13 +483,14 @@ struct mdt_thread_info { } som; } mti_u; - struct lustre_handle mti_close_handle; - loff_t mti_off; - struct lu_buf mti_buf; - struct lu_buf mti_big_buf; + struct lustre_handle mti_open_handle; + loff_t mti_off; + struct lu_buf mti_buf; + struct lu_buf mti_big_buf; /* Ops object filename */ struct lu_name mti_name; + char mti_filename[NAME_MAX + 1]; /* per-thread values, can be re-used, may be vmalloc'd */ void *mti_big_lmm; void *mti_big_acl; @@ -494,7 +498,7 @@ struct mdt_thread_info { int mti_big_aclsize; /* should be enough to fit lustre_mdt_attrs */ char mti_xattr_buf[128]; - struct ldlm_enqueue_info mti_einfo; + struct ldlm_enqueue_info mti_einfo[2]; /* einfo used by mdt_remote_object_lock_try() */ struct ldlm_enqueue_info mti_remote_einfo; struct tg_reply_data *mti_reply_data; @@ -758,6 +762,16 @@ int mdt_remote_object_lock(struct mdt_thread_info *mti, struct mdt_object *o, const struct lu_fid *fid, struct lustre_handle *lh, enum ldlm_mode mode, __u64 ibits, bool cache); +int mdt_reint_striped_lock(struct mdt_thread_info *info, + struct mdt_object *o, + struct mdt_lock_handle *lh, + __u64 ibits, + struct ldlm_enqueue_info *einfo, + bool cos_incompat); +void mdt_reint_striped_unlock(struct mdt_thread_info *info, + struct mdt_object *o, + struct mdt_lock_handle *lh, + struct ldlm_enqueue_info *einfo, int decref); enum mdt_name_flags { MNF_FIX_ANON = 1, @@ -809,11 +823,11 @@ void mdt_mfd_set_mode(struct mdt_file_data *mfd, __u64 mode); int mdt_reint_open(struct mdt_thread_info *info, - struct mdt_lock_handle *lhc); + struct mdt_lock_handle *lhc); -struct mdt_file_data *mdt_handle2mfd(struct mdt_export_data *med, - const struct lustre_handle *handle, - bool is_replay); +struct mdt_file_data *mdt_open_handle2mfd(struct mdt_export_data *med, + const struct lustre_handle *open_handle, + bool is_replay); int mdt_get_info(struct tgt_session_info *tsi); int mdt_attr_get_complex(struct mdt_thread_info *info, @@ -839,6 +853,7 @@ int mdt_handle_last_unlink(struct mdt_thread_info *, struct mdt_object *, void mdt_reconstruct_open(struct mdt_thread_info *, struct mdt_lock_handle *); int mdt_layout_change(struct mdt_thread_info *info, struct mdt_object *obj, struct md_layout_change *spec); +int mdt_device_sync(const struct lu_env *env, struct mdt_device *mdt); 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, @@ -879,6 +894,7 @@ int mdt_links_read(struct mdt_thread_info *info, struct linkea_data *ldata); int mdt_close_internal(struct mdt_thread_info *info, struct ptlrpc_request *req, struct mdt_body *repbody); +int mdt_remote_dir_permission(struct mdt_thread_info *info); static inline struct mdt_device *mdt_dev(struct lu_device *d) { @@ -1122,7 +1138,8 @@ static int mdt_dom_glimpse_ast(struct ldlm_lock *lock, void *reqp) } /* Issues dlm lock on passed @ns, @f stores it lock handle into @lh. */ -static inline int mdt_fid_lock(struct ldlm_namespace *ns, +static inline int mdt_fid_lock(const struct lu_env *env, + struct ldlm_namespace *ns, struct lustre_handle *lh, enum ldlm_mode mode, union ldlm_policy_data *policy, const struct ldlm_res_id *res_id, @@ -1134,7 +1151,7 @@ static inline int mdt_fid_lock(struct ldlm_namespace *ns, LASSERT(ns != NULL); LASSERT(lh != NULL); - rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS, policy, + rc = ldlm_cli_enqueue_local(env, ns, res_id, LDLM_IBITS, policy, mode, &flags, mdt_blocking_ast, ldlm_completion_ast, glimpse ? mdt_dom_glimpse_ast : NULL, @@ -1181,15 +1198,16 @@ int mdt_lsom_update(struct mdt_thread_info *info, struct mdt_object *obj, /* mdt_lvb.c */ extern struct ldlm_valblock_ops mdt_lvbo; int mdt_dom_lvb_is_valid(struct ldlm_resource *res); -int mdt_dom_lvbo_update(struct ldlm_resource *res, struct ldlm_lock *lock, - struct ptlrpc_request *req, bool increase_only); +int mdt_dom_lvbo_update(const struct lu_env *env, struct ldlm_resource *res, + struct ldlm_lock *lock, struct ptlrpc_request *req, + bool increase_only); void mdt_enable_cos(struct mdt_device *dev, bool enable); int mdt_cos_is_enabled(struct mdt_device *); /* lprocfs stuff */ -enum { - LPROC_MDT_OPEN = 0, +enum mdt_stat_idx { + LPROC_MDT_OPEN, LPROC_MDT_CLOSE, LPROC_MDT_MKNOD, LPROC_MDT_LINK, @@ -1210,6 +1228,7 @@ enum { LPROC_MDT_IO_PUNCH, LPROC_MDT_LAST, }; + void mdt_counter_incr(struct ptlrpc_request *req, int opcode); void mdt_stats_counter_init(struct lprocfs_stats *stats); int mdt_procfs_init(struct mdt_device *mdt, const char *name); @@ -1278,12 +1297,11 @@ void mdt_dom_obj_lvb_update(const struct lu_env *env, struct mdt_object *mo, bool increase_only); int mdt_dom_lvb_alloc(struct ldlm_resource *res); -static inline void mdt_dom_check_and_discard(struct mdt_thread_info *mti, +static inline bool mdt_dom_check_for_discard(struct mdt_thread_info *mti, struct mdt_object *mo) { - if (lu_object_is_dying(&mo->mot_header) && - S_ISREG(lu_object_attr(&mo->mot_obj))) - mdt_dom_discard_data(mti, mdt_object_fid(mo)); + return lu_object_is_dying(&mo->mot_header) && + S_ISREG(lu_object_attr(&mo->mot_obj)); } int mdt_dom_object_size(const struct lu_env *env, struct mdt_device *mdt,