X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_internal.h;h=b0f4430649f8eaa4bf4c20cd23f695ef44531161;hp=75e159e51606f625e2d00864300a7e97376fc3a5;hb=c6f3d533542b9462b5b8df95183d80321d4d9c34;hpb=1e7fc14bbf48f7e89876cbaa609972981e343944 diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h index 75e159e..b0f4430 100644 --- a/lustre/mdt/mdt_internal.h +++ b/lustre/mdt/mdt_internal.h @@ -65,15 +65,15 @@ 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; + u64 mfd_open_flags; /** protected by med_open_lock */ struct list_head mfd_list; /** 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; }; @@ -136,8 +136,6 @@ struct coordinator { __u64 cdt_policy; /**< policy flags */ enum cdt_states cdt_state; /**< state */ struct mutex cdt_state_lock; /**< cdt_state lock */ - atomic_t cdt_compound_id; /**< compound id - * counter */ __u64 cdt_last_cookie; /**< last cookie * allocated */ struct rw_semaphore cdt_llog_lock; /**< protect llog @@ -190,6 +188,19 @@ struct coordinator { #define MDT_FL_CFGLOG 0 #define MDT_FL_SYNCED 1 +/* possible values for mo_dom_lock */ +enum { + NO_DOM_LOCK_ON_OPEN = 0, + TRYLOCK_DOM_ON_OPEN = 1, + ALWAYS_DOM_LOCK_ON_OPEN = 2, + NUM_DOM_LOCK_ON_OPEN_MODES +}; + +struct mdt_statfs_cache { + struct obd_statfs msf_osfs; + __u64 msf_age; +}; + struct mdt_device { /* super-class */ struct lu_device mdt_lu_dev; @@ -203,6 +214,7 @@ struct mdt_device { struct md_device *mdt_child; struct dt_device *mdt_bottom; struct obd_export *mdt_bottom_exp; + struct local_oid_storage *mdt_los; /** target device */ struct lu_target mdt_lut; /* @@ -213,7 +225,9 @@ struct mdt_device { mo_acl:1, mo_cos:1, mo_evict_tgt_nids:1, - mo_dom_lock:1; + mo_dom_read_open:1, + mo_migrate_hsm_allowed:1; + unsigned int mo_dom_lock; } mdt_opts; /* mdt state flags */ unsigned long mdt_state; @@ -235,13 +249,23 @@ struct mdt_device { unsigned int mdt_capa_conf:1, /* Enable remote dir on non-MDT0 */ mdt_enable_remote_dir:1, - mdt_skip_lfsck:1; - + mdt_enable_striped_dir:1, + mdt_enable_dir_migration:1, + mdt_enable_remote_rename:1, + mdt_skip_lfsck:1, + mdt_readonly:1; + + /* user with gid can create remote/striped + * dir, and set default dir stripe */ gid_t mdt_enable_remote_dir_gid; /* lock for osfs and md_root */ spinlock_t mdt_lock; + /* statfs optimization: we cache a bit */ + struct mdt_statfs_cache mdt_sum_osfs; + struct mdt_statfs_cache mdt_osfs; + /* root squash */ struct root_squash_info mdt_squash; @@ -277,6 +301,8 @@ struct mdt_object { * attribute cache */ int mot_write_count; spinlock_t mot_write_lock; + /* Lock to protect object's SOM update. */ + struct mutex mot_som_mutex; /* Lock to protect create_data */ struct mutex mot_lov_mutex; /* lock to protect read/write stages for Data-on-MDT files */ @@ -331,7 +357,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; @@ -339,6 +366,7 @@ struct mdt_reint_record { void *rr_eadata; int rr_eadatalen; __u32 rr_flags; + __u16 rr_mirror_id; }; enum mdt_reint_flag { @@ -385,7 +413,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. */ @@ -456,15 +485,19 @@ struct mdt_thread_info { struct { struct md_attr attr; } hsm; - } mti_u; + struct { + struct md_attr attr; + } 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; @@ -472,11 +505,11 @@ 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; - struct lustre_som_attrs mti_som; - /* FLR: layout change API */ struct md_layout_change mti_layout; }; @@ -508,7 +541,6 @@ struct cdt_agent_req { struct hlist_node car_cookie_hash; /**< find req by cookie */ struct list_head car_request_list; /**< to chain all the req. */ atomic_t car_refcount; /**< reference counter */ - __u64 car_compound_id; /**< compound id */ __u64 car_flags; /**< request original flags */ struct obd_uuid car_uuid; /**< agent doing the req. */ __u32 car_archive_id; /**< archive id */ @@ -677,6 +709,12 @@ static inline bool mdt_lmm_is_flr(struct lov_mds_md *lmm) le16_to_cpu(lcm->lcm_mirror_count) > 0; } +static inline bool mdt_is_sum_statfs_client(struct obd_export *exp) +{ + return exp_connect_flags(exp) & OBD_CONNECT_FLAGS2 && + exp_connect_flags2(exp) & OBD_CONNECT2_SUM_STATFS; +} + __u64 mdt_get_disposition(struct ldlm_reply *rep, __u64 op_flag); void mdt_set_disposition(struct mdt_thread_info *info, struct ldlm_reply *rep, __u64 op_flag); @@ -731,6 +769,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, @@ -751,7 +799,7 @@ int mdt_pack_acl2body(struct mdt_thread_info *info, struct mdt_body *repbody, void mdt_pack_attr2body(struct mdt_thread_info *info, struct mdt_body *b, const struct lu_attr *attr, const struct lu_fid *fid); int mdt_pack_size2body(struct mdt_thread_info *info, - const struct lu_fid *fid, bool dom_lock); + const struct lu_fid *fid, struct lustre_handle *lh); int mdt_getxattr(struct mdt_thread_info *info); int mdt_reint_setxattr(struct mdt_thread_info *info, struct mdt_lock_handle *lh); @@ -775,18 +823,16 @@ int mdt_export_stats_init(struct obd_device *obd, void *client_nid); int mdt_lock_new_child(struct mdt_thread_info *info, - struct mdt_object *o, - struct mdt_lock_handle *child_lockh); - -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_file_data *mdt_handle2mfd(struct mdt_export_data *med, - const struct lustre_handle *handle, - bool is_replay); + struct mdt_object *o, + struct mdt_lock_handle *child_lockh); +void mdt_mfd_set_mode(struct mdt_file_data *mfd, u64 open_flags); +int mdt_reint_open(struct mdt_thread_info *info, struct mdt_lock_handle *lhc); +struct mdt_file_data *mdt_open_handle2mfd(struct mdt_export_data *med, + const struct lustre_handle *open_handle, + bool is_replay); +int mdt_revoke_remote_lookup_lock(struct mdt_thread_info *info, + struct mdt_object *pobj, + struct mdt_object *obj); int mdt_get_info(struct tgt_session_info *tsi); int mdt_attr_get_complex(struct mdt_thread_info *info, @@ -795,6 +841,8 @@ int mdt_big_xattr_get(struct mdt_thread_info *info, struct mdt_object *o, const char *name); int mdt_stripe_get(struct mdt_thread_info *info, struct mdt_object *o, struct md_attr *ma, const char *name); +int mdt_attr_get_pfid(struct mdt_thread_info *info, struct mdt_object *o, + struct lu_fid *pfid); int mdt_write_get(struct mdt_object *o); void mdt_write_put(struct mdt_object *o); int mdt_write_read(struct mdt_object *o); @@ -810,6 +858,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, @@ -850,6 +899,8 @@ 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); +void mdt_pack_secctx_in_reply(struct mdt_thread_info *info, + struct mdt_object *child); static inline struct mdt_device *mdt_dev(struct lu_device *d) { @@ -911,8 +962,8 @@ int cdt_llog_process(const struct lu_env *env, struct mdt_device *mdt, llog_cb_t cb, void *data, u32 start_cat_idx, u32 start_rec_idx, int rw); int mdt_agent_record_add(const struct lu_env *env, struct mdt_device *mdt, - __u64 compound_id, __u32 archive_id, - __u64 flags, struct hsm_action_item *hai); + __u32 archive_id, __u64 flags, + struct hsm_action_item *hai); int mdt_agent_record_update(const struct lu_env *env, struct mdt_device *mdt, struct hsm_record_update *updates, unsigned int updates_count); @@ -942,8 +993,11 @@ int mdt_hsm_agent_send(struct mdt_thread_info *mti, struct hsm_action_list *hal, /* mdt/mdt_hsm_cdt_client.c */ int mdt_hsm_add_actions(struct mdt_thread_info *info, struct hsm_action_list *hal); -int mdt_hsm_get_actions(struct mdt_thread_info *mti, - struct hsm_action_list *hal); +int mdt_hsm_get_action(struct mdt_thread_info *mti, + const struct lu_fid *fid, + enum hsm_copytool_action *action, + enum agent_req_status *status, + struct hsm_extent *extent); bool mdt_hsm_restore_is_running(struct mdt_thread_info *mti, const struct lu_fid *fid); /* mdt/mdt_hsm_cdt_requests.c */ @@ -951,8 +1005,8 @@ extern struct cfs_hash_ops cdt_request_cookie_hash_ops; extern struct cfs_hash_ops cdt_agent_record_hash_ops; extern const struct file_operations mdt_hsm_active_requests_fops; void dump_requests(char *prefix, struct coordinator *cdt); -struct cdt_agent_req *mdt_cdt_alloc_request(__u64 compound_id, __u32 archive_id, - __u64 flags, struct obd_uuid *uuid, +struct cdt_agent_req *mdt_cdt_alloc_request(__u32 archive_id, __u64 flags, + struct obd_uuid *uuid, struct hsm_action_item *hai); void mdt_cdt_free_request(struct cdt_agent_req *car); int mdt_cdt_add_request(struct coordinator *cdt, struct cdt_agent_req *new_car); @@ -1039,10 +1093,9 @@ static inline struct mdt_device *mdt_exp2dev(struct obd_export *exp) static inline bool mdt_rdonly(struct obd_export *exp) { - if (exp_connect_flags(exp) & OBD_CONNECT_RDONLY || - mdt_exp2dev(exp)->mdt_bottom->dd_rdonly) - return true; - return false; + return (exp_connect_flags(exp) & OBD_CONNECT_RDONLY || + mdt_exp2dev(exp)->mdt_bottom->dd_rdonly || + mdt_exp2dev(exp)->mdt_readonly); } typedef void (*mdt_reconstruct_t)(struct mdt_thread_info *mti, @@ -1090,7 +1143,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, @@ -1102,7 +1156,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, @@ -1139,22 +1193,26 @@ static inline enum ldlm_mode mdt_mdl_mode2dlm_mode(mdl_mode_t mode) /* mdt_som.c */ int mdt_set_som(struct mdt_thread_info *info, struct mdt_object *obj, - struct lu_attr *attr); + enum lustre_som_flags flag, __u64 size, __u64 blocks); int mdt_get_som(struct mdt_thread_info *info, struct mdt_object *obj, - struct lu_attr *attr); + struct md_attr *ma); +int mdt_lsom_downgrade(struct mdt_thread_info *info, struct mdt_object *obj); +int mdt_lsom_update(struct mdt_thread_info *info, struct mdt_object *obj, + bool truncate); /* 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 *, int); +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, @@ -1175,6 +1233,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); @@ -1233,6 +1292,8 @@ int mdt_glimpse_enqueue(struct mdt_thread_info *mti, struct ldlm_namespace *ns, struct ldlm_lock **lockp, __u64 flags); int mdt_brw_enqueue(struct mdt_thread_info *info, struct ldlm_namespace *ns, struct ldlm_lock **lockp, __u64 flags); +int mdt_dom_read_on_open(struct mdt_thread_info *mti, struct mdt_device *mdt, + struct lustre_handle *lh); void mdt_dom_discard_data(struct mdt_thread_info *info, const struct lu_fid *fid); int mdt_dom_disk_lvbo_update(const struct lu_env *env, struct mdt_object *mo, @@ -1241,12 +1302,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,