X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Flod%2Flod_internal.h;h=a240b720e2cda02e542912823bd7602c2d05b068;hp=2736f1d1149376b08ac4d9e9607ddf870fc25734;hb=381a8cdd527ce4deccfc3f7eb461892f6f2f3fff;hpb=d2d725d2e2d31899f0453c967f5707a72e796fa0

diff --git a/lustre/lod/lod_internal.h b/lustre/lod/lod_internal.h
index 2736f1d..a240b72 100644
--- a/lustre/lod/lod_internal.h
+++ b/lustre/lod/lod_internal.h
@@ -23,7 +23,7 @@
  * Copyright  2009 Sun Microsystems, Inc. All rights reserved
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,7 +39,7 @@
 #define _LOD_INTERNAL_H
 
 #include <libcfs/libcfs.h>
-#include <lustre_cfg.h>
+#include <uapi/linux/lustre/lustre_cfg.h>
 #include <obd.h>
 #include <dt_object.h>
 
@@ -76,7 +76,6 @@ struct pool_desc {
 	struct obd_device	*pool_lobd;	/* owner */
 };
 
-#define pool_tgt_size(p) ((p)->pool_obds.op_size)
 #define pool_tgt_count(p) ((p)->pool_obds.op_count)
 #define pool_tgt_array(p)  ((p)->pool_obds.op_array)
 #define pool_tgt_rw_sem(p) ((p)->pool_obds.op_rw_sem)
@@ -101,8 +100,9 @@ struct lod_qos_oss {
 	__u64			 lqo_penalty;	/* current penalty */
 	__u64			 lqo_penalty_per_obj; /* penalty decrease
 							 every obj*/
-	time_t			 lqo_used;	/* last used time, seconds */
+	time64_t		 lqo_used;	/* last used time, seconds */
 	__u32			 lqo_ost_count;	/* number of osts on this oss */
+	__u32			 lqo_id;	/* unique oss id */
 };
 
 struct ltd_qos {
@@ -111,7 +111,7 @@ struct ltd_qos {
 	__u64			 ltq_penalty_per_obj; /* penalty decrease
 							 every obj*/
 	__u64			 ltq_weight;	/* net weighting */
-	time_t			 ltq_used;	/* last used time, seconds */
+	time64_t		 ltq_used;	/* last used time, seconds */
 	bool			 ltq_usable:1;	/* usable for striping */
 };
 
@@ -128,7 +128,8 @@ struct lod_tgt_desc {
 	unsigned long      ltd_active:1,/* is this target up for requests */
 			   ltd_activate:1,/* should  target be activated */
 			   ltd_reap:1,  /* should this target be deleted */
-			   ltd_got_update_log:1; /* Already got update log */
+			   ltd_got_update_log:1, /* Already got update log */
+			   ltd_connecting:1; /* target is connecting */
 };
 
 #define TGT_PTRS		256     /* number of pointers at 1st level */
@@ -152,7 +153,7 @@ struct lod_tgt_descs {
 	/* number of registered TGTs */
 	__u32			ltd_tgtnr;
 	/* bitmap of TGTs available */
-	cfs_bitmap_t		*ltd_tgt_bitmap;
+	struct cfs_bitmap	*ltd_tgt_bitmap;
 	/* TGTs scheduled to be deleted */
 	__u32			ltd_death_row;
 	/* Table refcount used for delayed deletion */
@@ -163,11 +164,23 @@ struct lod_tgt_descs {
 	struct rw_semaphore	ltd_rw_sem;
 };
 
+struct lod_avoid_guide {
+	/* ids of OSSs avoid guidance */
+	__u32			*lag_oss_avoid_array;
+	/* number of filled array items */
+	unsigned int		lag_oaa_count;
+	/* number of allocated array items */
+	unsigned int		lag_oaa_size;
+	/* bitmap of OSTs avoid guidance */
+	struct cfs_bitmap	*lag_ost_avoid_bitmap;
+	/* how many OSTs are available for alloc */
+	__u32			lag_ost_avail;
+};
+
 struct lod_device {
 	struct dt_device      lod_dt_dev;
 	struct obd_export    *lod_child_exp;
 	struct dt_device     *lod_child;
-	struct proc_dir_entry *lod_proc_entry;
 	struct lprocfs_stats *lod_stats;
 	spinlock_t	      lod_connects_lock;
 	int		      lod_connects;
@@ -179,8 +192,8 @@ struct lod_device {
 	/* lov settings descriptor storing static information */
 	struct lov_desc	      lod_desc;
 
-	/* use to protect ld_active_tgt_count and all ltd_active */
-	spinlock_t	     lod_desc_lock;
+	/* protect ld_active_tgt_count, ltd_active and lod_md_root */
+	spinlock_t	     lod_lock;
 
 	/* Description of OST */
 	struct lod_tgt_descs  lod_ost_descs;
@@ -192,6 +205,8 @@ struct lod_device {
 
 	/* maximum EA size underlied OSD may have */
 	unsigned int	      lod_osd_max_easize;
+	/* maximum size of MDT stripe for Data-on-MDT files. */
+	unsigned int          lod_dom_max_stripesize;
 
 	/*FIXME: When QOS and pool is implemented for MDT, probably these
 	 * structure should be moved to lod_tgt_descs as well.
@@ -209,6 +224,10 @@ struct lod_device {
 	enum lustre_sec_part   lod_sp_me;
 
 	struct proc_dir_entry *lod_symlink;
+	struct dentry	       *lod_debugfs;
+
+	/* ROOT object, used to fetch FS default striping */
+	struct lod_object      *lod_md_root;
 };
 
 #define lod_osts	lod_ost_descs.ltd_tgts
@@ -225,58 +244,168 @@ struct lod_device {
 #define ltd_mdt			ltd_tgt
 #define lod_mdt_desc		lod_tgt_desc
 
-struct lod_dir_stripe_info {
-	__u32	ldsi_stripe_offset;
-	__u32	ldsi_def_stripenr;
-	__u32	ldsi_def_stripe_offset;
-	__u32	ldsi_def_hash_type;
-	__u32	ldsi_hash_type;
+struct lod_layout_component {
+	struct lu_extent	  llc_extent;
+	__u32			  llc_id;
+	__u32			  llc_flags;
+	__u32			  llc_stripe_size;
+	__u32			  llc_pattern;
+	__u16			  llc_layout_gen;
+	__u16			  llc_stripe_offset;
+	__u16			  llc_stripe_count;
+	__u16			  llc_stripes_allocated;
+	__u64			  llc_timestamp; /* snapshot time */
+	char			 *llc_pool;
+	/* ost list specified with LOV_USER_MAGIC_SPECIFIC lum */
+	struct ost_pool		  llc_ostlist;
+	struct dt_object	**llc_stripe;
+	__u32			 *llc_ost_indices;
+};
 
-	unsigned int ldsi_def_striping_set:1,
-		     ldsi_def_striping_cached:1,
-		     ldsi_striped:1;
+struct lod_default_striping {
+	/* default LOV */
+	/* current layout component count */
+	__u16				lds_def_comp_cnt;
+	__u16				lds_def_mirror_cnt;
+	/* the largest comp count ever used */
+	__u32				lds_def_comp_size_cnt;
+	struct lod_layout_component	*lds_def_comp_entries;
+	/* default LMV */
+	__u32				lds_dir_def_stripe_count;
+	__u32				lds_dir_def_stripe_offset;
+	__u32				lds_dir_def_hash_type;
+					/* default file striping flags (LOV) */
+	__u32				lds_def_striping_set:1,
+					lds_def_striping_is_composite:1,
+					/* default dir striping flags (LMV) */
+					lds_dir_def_striping_set:1;
+};
+
+struct lod_mirror_entry {
+	__u16	lme_stale:1,
+		lme_primary:1;
+	/* mirror id */
+	__u16	lme_id;
+	/* start,end index of this mirror in ldo_comp_entries */
+	__u16	lme_start;
+	__u16	lme_end;
 };
 
-/*
- * XXX: shrink this structure, currently it's 72bytes on 32bit arch,
- *      so, slab will be allocating 128bytes
- */
 struct lod_object {
-	struct dt_object   ldo_obj;
-
-	/* if object is striped, then the next fields describe stripes */
-	/* For striped directory, ldo_stripenr == slave stripe count */
-	__u16		   ldo_stripenr;
-	__u16		   ldo_layout_gen;
-	__u32		   ldo_stripe_size;
-	__u32		   ldo_pattern;
-	__u16		   ldo_released_stripenr;
-	char		  *ldo_pool;
-	struct dt_object **ldo_stripe;
-	/* to know how much memory to free, ldo_stripenr can be less */
-	/* default striping for directory represented by this object
-	 * is cached in stripenr/stripe_size */
-	unsigned int	   ldo_stripes_allocated:16,
-			   ldo_striping_cached:1,
-			   ldo_def_striping_set:1,
-			   ldo_def_striping_cached:1,
-	/* ldo_dir_slave_stripe indicate this is a slave stripe of
-	 * a striped dir */
-			   ldo_dir_slave_stripe:1;
-	__u32		   ldo_def_stripe_size;
-	__u16		   ldo_def_stripenr;
-	__u16		   ldo_def_stripe_offset;
-	struct lod_dir_stripe_info	*ldo_dir_stripe;
+	/* common fields for both files and directories */
+	struct dt_object		ldo_obj;
+	struct mutex			ldo_layout_mutex;
+	union {
+		/* file stripe (LOV) */
+		struct {
+			__u32		ldo_layout_gen;
+			/* Layout component count for a regular file.
+			 * It equals to 1 for non-composite layout. */
+			__u16		ldo_comp_cnt;
+			/* Layout mirror count for a PFLR file.
+			 * It's 0 for files with non-composite layout. */
+			__u16		ldo_mirror_count;
+			struct lod_mirror_entry	*ldo_mirrors;
+			__u32		ldo_is_composite:1,
+					ldo_flr_state:2,
+					ldo_comp_cached:1;
+		};
+		/* directory stripe (LMV) */
+		struct {
+			/* Slave stripe count for striped directory. */
+			__u16		ldo_dir_stripe_count;
+			/* How many stripes allocated for a striped directory */
+			__u16		ldo_dir_stripes_allocated;
+			__u32		ldo_dir_stripe_offset;
+			__u32		ldo_dir_hash_type;
+			__u32		ldo_dir_migrate_offset;
+			__u32		ldo_dir_migrate_hash;
+			/* Is a slave stripe of striped directory? */
+			__u32		ldo_dir_slave_stripe:1,
+					ldo_dir_striped:1,
+					/* the stripe has been loaded */
+					ldo_dir_stripe_loaded:1;
+			/*
+			 * default striping is not cached, so this field is
+			 * invalid after create, make sure it's used by
+			 * lod_dir_striping_create_internal() only.
+			 */
+			struct lod_default_striping	*ldo_def_striping;
+		};
+	};
+	/* file stripe (LOV) */
+	struct lod_layout_component	*ldo_comp_entries;
+	/* slave stripes of striped directory (LMV) */
+	struct dt_object		**ldo_stripe;
 };
 
-#define ldo_dir_stripe_offset	ldo_dir_stripe->ldsi_stripe_offset
-#define ldo_dir_def_stripenr	ldo_dir_stripe->ldsi_def_stripenr
-#define ldo_dir_hash_type	ldo_dir_stripe->ldsi_hash_type
-#define ldo_dir_def_hash_type	ldo_dir_stripe->ldsi_def_hash_type
-#define ldo_dir_striped		ldo_dir_stripe->ldsi_striped
-#define ldo_dir_def_striping_set	ldo_dir_stripe->ldsi_def_striping_set
-#define ldo_dir_def_striping_cached	ldo_dir_stripe->ldsi_def_striping_cached
-#define ldo_dir_def_stripe_offset	ldo_dir_stripe->ldsi_def_stripe_offset
+#define lod_foreach_mirror_comp(comp, lo, mirror_idx)                      \
+for (comp = &lo->ldo_comp_entries[lo->ldo_mirrors[mirror_idx].lme_start];  \
+     comp <= &lo->ldo_comp_entries[lo->ldo_mirrors[mirror_idx].lme_end];   \
+     comp++)
+
+static inline bool lod_is_flr(const struct lod_object *lo)
+{
+	if (!lo->ldo_is_composite)
+		return false;
+
+	return (lo->ldo_flr_state & LCM_FL_FLR_MASK) != LCM_FL_NONE;
+}
+
+static inline int lod_set_pool(char **pool, const char *new_pool)
+{
+	int len;
+
+	if (*pool == new_pool)
+		return 0;
+
+	if (*pool != NULL) {
+		len = strlen(*pool) + 1;
+		OBD_FREE(*pool, len);
+		*pool = NULL;
+	}
+	if (new_pool != NULL) {
+		len = strlen(new_pool) + 1;
+		OBD_ALLOC(*pool, len);
+		if (*pool == NULL)
+			return -ENOMEM;
+		strlcpy(*pool, new_pool, len);
+	}
+	return 0;
+}
+
+static inline int lod_set_def_pool(struct lod_default_striping *lds,
+				   int i, const char *new_pool)
+{
+	return lod_set_pool(&lds->lds_def_comp_entries[i].llc_pool, new_pool);
+}
+
+static inline int lod_obj_set_pool(struct lod_object *lo, int i,
+				   const char *new_pool)
+{
+	return lod_set_pool(&lo->ldo_comp_entries[i].llc_pool, new_pool);
+}
+
+/**
+ * Create new layout generation.
+ *
+ * The only requirement for layout generation is that it changes when
+ * the layout is modified, so a circular counter is sufficient for the
+ * low rate of layout modifications.
+ *
+ * Layout generation is also used to generate unique component ID.
+ * To detect generation overflow, we preserve the highest bit of the
+ * generation when it wrapped.
+ */
+static inline void lod_obj_inc_layout_gen(struct lod_object *lo)
+{
+	__u32 preserve = lo->ldo_layout_gen & ~LCME_ID_MASK;
+	lo->ldo_layout_gen++;
+	lo->ldo_layout_gen |= preserve;
+	/* Zero is not a valid generation */
+	if (unlikely((lo->ldo_layout_gen & LCME_ID_MASK) == 0))
+		lo->ldo_layout_gen++;
+}
 
 struct lod_it {
 	struct dt_object	*lit_obj; /* object from the layer below */
@@ -287,26 +416,36 @@ struct lod_it {
 };
 
 struct lod_thread_info {
-	/* per-thread buffer for LOV EA */
-	void             *lti_ea_store;
-	__u32             lti_ea_store_size;
+	/* per-thread buffer for LOV EA, may be vmalloc'd */
+	void			       *lti_ea_store;
+	__u32				lti_ea_store_size;
 	/* per-thread buffer for LMV EA */
-	struct lu_buf     lti_buf;
-	struct ost_id     lti_ostid;
-	struct lu_fid     lti_fid;
-	struct obd_statfs lti_osfs;
-	struct lu_attr    lti_attr;
-	struct lod_it	  lti_it;
-	struct ldlm_res_id lti_res_id;
+	struct lu_buf			lti_buf;
+	struct ost_id			lti_ostid;
+	struct lu_fid			lti_fid;
+	struct obd_statfs		lti_osfs;
+	struct lu_attr			lti_attr;
+	struct lod_it			lti_it;
+	struct ldlm_res_id		lti_res_id;
 	/* used to hold lu_dirent, sizeof(struct lu_dirent) + NAME_MAX */
-	char		  lti_key[sizeof(struct lu_dirent) + NAME_MAX];
-	struct dt_object_format lti_format;
-	struct lu_name	  lti_name;
-	struct lu_buf	  lti_linkea_buf;
-	struct dt_insert_rec lti_dt_rec;
-	struct llog_catid lti_cid;
-	struct llog_cookie lti_cookie;
-	struct lustre_cfg lti_lustre_cfg;
+	char				lti_key[sizeof(struct lu_dirent) +
+						NAME_MAX];
+	struct dt_object_format		lti_format;
+	struct lu_name			lti_name;
+	struct lu_buf			lti_linkea_buf;
+	struct dt_insert_rec		lti_dt_rec;
+	struct llog_catid		lti_cid;
+	struct llog_cookie		lti_cookie;
+	struct lustre_cfg		lti_lustre_cfg;
+	/* used to store parent default striping in create */
+	struct lod_default_striping	lti_def_striping;
+	struct filter_fid		lti_ff;
+	__u32				*lti_comp_idx;
+	size_t				lti_comp_size;
+	size_t				lti_count;
+	struct lu_attr			lti_layout_attr;
+	/* object allocation avoid guide info */
+	struct lod_avoid_guide		lti_avoid;
 };
 
 extern const struct lu_device_operations lod_lu_ops;
@@ -349,6 +488,11 @@ static inline struct lu_object *lod2lu_obj(struct lod_object *obj)
 	return &obj->ldo_obj.do_lu;
 }
 
+static inline const struct lu_fid *lod_object_fid(struct lod_object *obj)
+{
+	return lu_object_fid(lod2lu_obj(obj));
+}
+
 static inline struct lod_object *lod_obj(const struct lu_object *o)
 {
 	LASSERT(lu_device_is_lod(o->lo_dev));
@@ -366,6 +510,26 @@ static inline struct dt_object* lod_object_child(struct lod_object *o)
 			struct dt_object, do_lu);
 }
 
+static inline bool lod_obj_is_striped(struct dt_object *dt)
+{
+	struct lod_object *lo = lod_dt_obj(dt);
+	int i;
+
+	if (!dt_object_exists(dt_object_child(dt)))
+		return false;
+
+	if (S_ISDIR(dt->do_lu.lo_header->loh_attr))
+		return lo->ldo_dir_stripe_count != 0;
+
+	for (i = 0; i < lo->ldo_comp_cnt; i++) {
+		if (lo->ldo_comp_entries[i].llc_stripe == NULL)
+			continue;
+		LASSERT(lo->ldo_comp_entries[i].llc_stripe_count > 0);
+		return true;
+	}
+	return false;
+}
+
 extern struct lu_context_key lod_thread_key;
 
 static inline struct lod_thread_info *lod_env_info(const struct lu_env *env)
@@ -387,6 +551,19 @@ lod_name_get(const struct lu_env *env, const void *area, int len)
 	return lname;
 }
 
+static inline void lod_layout_get_pool(struct lod_layout_component *entries,
+				       int count, char *pool, int len)
+{
+	int i;
+
+	for (i = 0; i < count; i++) {
+		if (entries[i].llc_pool != NULL) {
+			strlcpy(pool, entries[i].llc_pool, len);
+			break;
+		}
+	}
+}
+
 #define lod_foreach_ost(__dev, index)	\
 	if ((__dev)->lod_osts_size > 0)	\
 		cfs_foreach_bit((__dev)->lod_ost_bitmap, (index))
@@ -403,6 +580,7 @@ int lod_sub_init_llog(const struct lu_env *env, struct lod_device *lod,
 void lod_sub_fini_llog(const struct lu_env *env,
 		       struct dt_device *dt, struct ptlrpc_thread *thread);
 int lodname2mdt_index(char *lodname, __u32 *mdt_index);
+extern void target_recovery_fini(struct obd_device *obd);
 
 /* lod_lov.c */
 void lod_getref(struct lod_tgt_descs *ltd);
@@ -415,8 +593,9 @@ int lod_del_device(const struct lu_env *env, struct lod_device *lod,
 		   unsigned gen, bool for_ost);
 int lod_fini_tgt(const struct lu_env *env, struct lod_device *lod,
 		 struct lod_tgt_descs *ltd, bool for_ost);
-int lod_load_striping_locked(const struct lu_env *env, struct lod_object *lo);
-int lod_load_striping(const struct lu_env *env, struct lod_object *lo);
+int lod_striping_load(const struct lu_env *env, struct lod_object *lo);
+int lod_striping_reload(const struct lu_env *env, struct lod_object *lo,
+			const struct lu_buf *buf);
 
 int lod_get_ea(const struct lu_env *env, struct lod_object *lo,
 	       const char *name);
@@ -438,6 +617,44 @@ lod_get_default_lmv_ea(const struct lu_env *env, struct lod_object *lo)
 	return lod_get_ea(env, lo, XATTR_NAME_DEFAULT_LMV);
 }
 
+static inline void
+lod_comp_set_init(struct lod_layout_component *entry)
+{
+	entry->llc_flags |= LCME_FL_INIT;
+}
+
+static inline void
+lod_comp_unset_init(struct lod_layout_component *entry)
+{
+	entry->llc_flags &= ~LCME_FL_INIT;
+}
+
+static inline bool
+lod_comp_inited(const struct lod_layout_component *entry)
+{
+	return entry->llc_flags & LCME_FL_INIT;
+}
+
+/**
+ * For a PFL file, some of its component could be un-instantiated, so
+ * that their lov_ost_data_v1 array is not needed, we'd use this function
+ * to reduce the LOVEA buffer size.
+ *
+ * Note: if llc_ostlist contains value, we'd need lov_ost_data_v1 array to
+ * save the specified OST index list.
+ */
+static inline void
+lod_comp_shrink_stripe_count(struct lod_layout_component *lod_comp,
+			     __u16 *stripe_count)
+{
+	/**
+	 * Need one lov_ost_data_v1 to store invalid ost_idx, please refer to
+	 * lod_parse_striping()
+	 */
+	if (!lod_comp_inited(lod_comp) && lod_comp->llc_ostlist.op_count == 0)
+		*stripe_count = 1;
+}
+
 void lod_fix_desc(struct lov_desc *desc);
 void lod_fix_desc_qos_maxage(__u32 *val);
 void lod_fix_desc_pattern(__u32 *val);
@@ -450,12 +667,18 @@ int lod_parse_striping(const struct lu_env *env, struct lod_object *mo,
 int lod_parse_dir_striping(const struct lu_env *env, struct lod_object *lo,
 			   const struct lu_buf *buf);
 int lod_initialize_objects(const struct lu_env *env, struct lod_object *mo,
-			   struct lov_ost_data_v1 *objs);
-int lod_verify_striping(struct lod_device *d, const struct lu_buf *buf,
-			bool is_from_disk);
-int lod_generate_and_set_lovea(const struct lu_env *env,
-			       struct lod_object *mo, struct thandle *th);
+			   struct lov_ost_data_v1 *objs, int index);
+int lod_verify_striping(struct lod_device *d, struct lod_object *lo,
+			const struct lu_buf *buf, bool is_from_disk);
+int lod_generate_lovea(const struct lu_env *env, struct lod_object *lo,
+		       struct lov_mds_md *lmm, int *lmm_size, bool is_dir);
 int lod_ea_store_resize(struct lod_thread_info *info, size_t size);
+int lod_def_striping_comp_resize(struct lod_default_striping *lds, __u16 count);
+void lod_free_def_comp_entries(struct lod_default_striping *lds);
+void lod_free_comp_entries(struct lod_object *lo);
+int lod_alloc_comp_entries(struct lod_object *lo, int mirror_cnt, int comp_cnt);
+int lod_fill_mirrors(struct lod_object *lo);
+
 /* lod_pool.c */
 int lod_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count);
 int lod_ost_pool_remove(struct ost_pool *op, __u32 idx);
@@ -471,13 +694,50 @@ int lod_pool_new(struct obd_device *obd, char *poolname);
 int lod_pool_add(struct obd_device *obd, char *poolname, char *ostname);
 int lod_pool_remove(struct obd_device *obd, char *poolname, char *ostname);
 
+struct lod_obj_stripe_cb_data;
+typedef int (*lod_obj_stripe_cb_t)(const struct lu_env *env,
+				   struct lod_object *lo, struct dt_object *dt,
+				   struct thandle *th,
+				   int comp_idx, int stripe_idx,
+				   struct lod_obj_stripe_cb_data *data);
+typedef bool (*lod_obj_comp_skip_cb_t)(const struct lu_env *env,
+					struct lod_object *lo, int comp_idx,
+					struct lod_obj_stripe_cb_data *data);
+typedef int (*lod_obj_comp_cb_t)(const struct lu_env *env,
+				struct lod_object *lo, int comp_idx,
+				struct lod_obj_stripe_cb_data *data);
+struct lod_obj_stripe_cb_data {
+	union {
+		const struct lu_attr	*locd_attr;
+		int			locd_ost_index;
+		const struct lu_buf	*locd_buf;
+	};
+	lod_obj_stripe_cb_t		locd_stripe_cb;
+	lod_obj_comp_skip_cb_t		locd_comp_skip_cb;
+	lod_obj_comp_cb_t		locd_comp_cb;
+	bool				locd_declare;
+};
+
 /* lod_qos.c */
-int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo,
-			struct lu_attr *attr, const struct lu_buf *buf,
-			struct thandle *th);
+int lod_prepare_create(const struct lu_env *env, struct lod_object *lo,
+		       struct lu_attr *attr, const struct lu_buf *buf,
+		       struct thandle *th);
 int qos_add_tgt(struct lod_device*, struct lod_tgt_desc *);
 int qos_del_tgt(struct lod_device *, struct lod_tgt_desc *);
 void lod_qos_rr_init(struct lod_qos_rr *lqr);
+int lod_use_defined_striping(const struct lu_env *, struct lod_object *,
+			     const struct lu_buf *);
+int lod_qos_parse_config(const struct lu_env *env, struct lod_object *lo,
+			 const struct lu_buf *buf);
+int lod_qos_prep_create(const struct lu_env *env, struct lod_object *lo,
+			struct lu_attr *attr, struct thandle *th,
+			int comp_idx);
+__u16 lod_comp_entry_stripe_count(struct lod_object *lo,
+				  struct lod_layout_component *entry,
+				  bool is_dir);
+__u16 lod_get_stripe_count(struct lod_device *lod, struct lod_object *lo,
+			   __u16 stripe_count);
+void lod_qos_statfs_update(const struct lu_env *env, struct lod_device *lod);
 
 /* lproc_lod.c */
 int lod_procfs_init(struct lod_device *lod);
@@ -486,100 +746,82 @@ void lod_procfs_fini(struct lod_device *lod);
 /* lod_object.c */
 extern struct dt_object_operations lod_obj_ops;
 extern struct lu_object_operations lod_lu_obj_ops;
+
 int lod_load_lmv_shards(const struct lu_env *env, struct lod_object *lo,
 			struct lu_buf *buf, bool resize);
-int lod_object_set_pool(struct lod_object *o, char *pool);
-int lod_declare_striped_object(const struct lu_env *env, struct dt_object *dt,
+int lod_declare_striped_create(const struct lu_env *env, struct dt_object *dt,
 			       struct lu_attr *attr,
 			       const struct lu_buf *lovea, struct thandle *th);
-int lod_striping_create(const struct lu_env *env, struct dt_object *dt,
+int lod_striped_create(const struct lu_env *env, struct dt_object *dt,
 			struct lu_attr *attr, struct dt_object_format *dof,
 			struct thandle *th);
-void lod_object_free_striping(const struct lu_env *env, struct lod_object *lo);
+void lod_striping_free_nolock(const struct lu_env *env, struct lod_object *lo);
+void lod_striping_free(const struct lu_env *env, struct lod_object *lo);
+
+int lod_obj_for_each_stripe(const struct lu_env *env, struct lod_object *lo,
+			    struct thandle *th,
+			    struct lod_obj_stripe_cb_data *data);
+int lod_comp_copy_ost_lists(struct lod_layout_component *lod_comp,
+			    struct lov_user_md_v3 *v3);
 
 /* lod_sub_object.c */
 struct thandle *lod_sub_get_thandle(const struct lu_env *env,
 				    struct thandle *th,
 				    const struct dt_object *sub_obj,
 				    bool *record_update);
-int lod_sub_object_declare_create(const struct lu_env *env,
-				  struct dt_object *dt,
-				  struct lu_attr *attr,
-				  struct dt_allocation_hint *hint,
-				  struct dt_object_format *dof,
-				  struct thandle *th);
-int lod_sub_object_create(const struct lu_env *env, struct dt_object *dt,
-			  struct lu_attr *attr,
-			  struct dt_allocation_hint *hint,
-			  struct dt_object_format *dof,
-			  struct thandle *th);
-int lod_sub_object_declare_ref_add(const struct lu_env *env,
-				   struct dt_object *dt,
-				   struct thandle *th);
-int lod_sub_object_ref_add(const struct lu_env *env, struct dt_object *dt,
-			   struct thandle *th);
-int lod_sub_object_declare_ref_del(const struct lu_env *env,
-				   struct dt_object *dt,
-				   struct thandle *th);
-int lod_sub_object_ref_del(const struct lu_env *env, struct dt_object *dt,
-			   struct thandle *th);
-int lod_sub_object_declare_destroy(const struct lu_env *env,
-				   struct dt_object *dt,
-				   struct thandle *th);
-int lod_sub_object_destroy(const struct lu_env *env, struct dt_object *dt,
-			   struct thandle *th);
-int lod_sub_object_declare_insert(const struct lu_env *env,
-				  struct dt_object *dt,
-				  const struct dt_rec *rec,
-				  const struct dt_key *key,
-				  struct thandle *th);
-int lod_sub_object_index_insert(const struct lu_env *env, struct dt_object *dt,
-				const struct dt_rec *rec,
-				const struct dt_key *key, struct thandle *th,
-				int ign);
-int lod_sub_object_declare_delete(const struct lu_env *env,
-				  struct dt_object *dt,
-				  const struct dt_key *key,
-				  struct thandle *th);
-int lod_sub_object_delete(const struct lu_env *env, struct dt_object *dt,
-			  const struct dt_key *name, struct thandle *th);
-int lod_sub_object_declare_xattr_set(const struct lu_env *env,
-				     struct dt_object *dt,
-				     const struct lu_buf *buf,
-				     const char *name, int fl,
-				     struct thandle *th);
-int lod_sub_object_xattr_set(const struct lu_env *env, struct dt_object *dt,
-			     const struct lu_buf *buf, const char *name, int fl,
-			     struct thandle *th);
-int lod_sub_object_declare_attr_set(const struct lu_env *env,
-				    struct dt_object *dt,
-				    const struct lu_attr *attr,
-				    struct thandle *th);
-int lod_sub_object_attr_set(const struct lu_env *env,
-			    struct dt_object *dt,
-			    const struct lu_attr *attr,
+int lod_sub_declare_create(const struct lu_env *env, struct dt_object *dt,
+			   struct lu_attr *attr,
+			   struct dt_allocation_hint *hint,
+			   struct dt_object_format *dof, struct thandle *th);
+int lod_sub_create(const struct lu_env *env, struct dt_object *dt,
+		   struct lu_attr *attr, struct dt_allocation_hint *hint,
+		   struct dt_object_format *dof, struct thandle *th);
+int lod_sub_declare_ref_add(const struct lu_env *env, struct dt_object *dt,
 			    struct thandle *th);
-int lod_sub_object_declare_xattr_del(const struct lu_env *env,
-				     struct dt_object *dt,
-				     const char *name,
-				     struct thandle *th);
-int lod_sub_object_xattr_del(const struct lu_env *env,
-			     struct dt_object *dt,
-			     const char *name,
-			     struct thandle *th);
-int lod_sub_object_declare_write(const struct lu_env *env,
-				 struct dt_object *dt,
-				 const struct lu_buf *buf, loff_t pos,
-				 struct thandle *th);
-ssize_t lod_sub_object_write(const struct lu_env *env, struct dt_object *dt,
-			     const struct lu_buf *buf, loff_t *pos,
-			     struct thandle *th, int rq);
-int lod_sub_object_declare_punch(const struct lu_env *env,
-				 struct dt_object *dt,
-				 __u64 start, __u64 end,
-				 struct thandle *th);
-int lod_sub_object_punch(const struct lu_env *env, struct dt_object *dt,
-			 __u64 start, __u64 end, struct thandle *th);
+int lod_sub_ref_add(const struct lu_env *env, struct dt_object *dt,
+		    struct thandle *th);
+int lod_sub_declare_ref_del(const struct lu_env *env, struct dt_object *dt,
+			    struct thandle *th);
+int lod_sub_ref_del(const struct lu_env *env, struct dt_object *dt,
+		    struct thandle *th);
+int lod_sub_declare_destroy(const struct lu_env *env, struct dt_object *dt,
+			    struct thandle *th);
+int lod_sub_destroy(const struct lu_env *env, struct dt_object *dt,
+		    struct thandle *th);
+int lod_sub_declare_insert(const struct lu_env *env, struct dt_object *dt,
+			   const struct dt_rec *rec, const struct dt_key *key,
+			   struct thandle *th);
+int lod_sub_insert(const struct lu_env *env, struct dt_object *dt,
+		   const struct dt_rec *rec, const struct dt_key *key,
+		   struct thandle *th);
+int lod_sub_declare_delete(const struct lu_env *env, struct dt_object *dt,
+			   const struct dt_key *key, struct thandle *th);
+int lod_sub_delete(const struct lu_env *env, struct dt_object *dt,
+		   const struct dt_key *name, struct thandle *th);
+int lod_sub_declare_xattr_set(const struct lu_env *env, struct dt_object *dt,
+			      const struct lu_buf *buf, const char *name,
+			      int fl, struct thandle *th);
+int lod_sub_xattr_set(const struct lu_env *env, struct dt_object *dt,
+		      const struct lu_buf *buf, const char *name, int fl,
+		      struct thandle *th);
+int lod_sub_declare_attr_set(const struct lu_env *env, struct dt_object *dt,
+			     const struct lu_attr *attr, struct thandle *th);
+int lod_sub_attr_set(const struct lu_env *env, struct dt_object *dt,
+		     const struct lu_attr *attr, struct thandle *th);
+int lod_sub_declare_xattr_del(const struct lu_env *env, struct dt_object *dt,
+			      const char *name, struct thandle *th);
+int lod_sub_xattr_del(const struct lu_env *env, struct dt_object *dt,
+		      const char *name, struct thandle *th);
+int lod_sub_declare_write(const struct lu_env *env, struct dt_object *dt,
+			  const struct lu_buf *buf, loff_t pos,
+			  struct thandle *th);
+ssize_t lod_sub_write(const struct lu_env *env, struct dt_object *dt,
+		      const struct lu_buf *buf, loff_t *pos,
+		      struct thandle *th);
+int lod_sub_declare_punch(const struct lu_env *env, struct dt_object *dt,
+			  __u64 start, __u64 end, struct thandle *th);
+int lod_sub_punch(const struct lu_env *env, struct dt_object *dt,
+		  __u64 start, __u64 end, struct thandle *th);
 
 int lod_sub_prep_llog(const struct lu_env *env, struct lod_device *lod,
 		      struct dt_device *dt, int index);