X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_object.c;h=bb10a1f617b9802a889ade7c2dc7f738c8c9f5cf;hb=d8b486644ceef57c7388e8049b90bde4bf967500;hp=6b1373d2abe5546dbdeef32f20e1e532605562f3;hpb=c1baab294d7efb10a2e81cefc12dbc8103c8f175;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index 6b1373d..bb10a1f 100644
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -125,8 +125,10 @@ osd_object_sa_dirty_add(struct osd_object *obj, struct osd_thandle *oh)
 		return;
 
 	cfs_down(&oh->ot_sa_lock);
+	cfs_write_lock(&obj->oo_attr_lock);
 	if (likely(cfs_list_empty(&obj->oo_sa_linkage)))
 		cfs_list_add(&obj->oo_sa_linkage, &oh->ot_sa_list);
+	cfs_write_unlock(&obj->oo_attr_lock);
 	cfs_up(&oh->ot_sa_lock);
 }
 
@@ -142,7 +144,9 @@ void osd_object_sa_dirty_rele(struct osd_thandle *oh)
 		obj = cfs_list_entry(oh->ot_sa_list.next,
 				     struct osd_object, oo_sa_linkage);
 		sa_spill_rele(obj->oo_sa_hdl);
+		cfs_write_lock(&obj->oo_attr_lock);
 		cfs_list_del_init(&obj->oo_sa_linkage);
+		cfs_write_unlock(&obj->oo_attr_lock);
 	}
 	cfs_up(&oh->ot_sa_lock);
 }
@@ -731,6 +735,10 @@ static int osd_attr_get(const struct lu_env *env,
 	 * from within sa_object_size() can block on a mutex, so
 	 * we can't call sa_object_size() holding rwlock */
 	sa_object_size(obj->oo_sa_hdl, &blksize, &blocks);
+	/* we do not control size of indices, so always calculate
+	 * it from number of blocks reported by DMU */
+	if (S_ISDIR(attr->la_mode))
+		attr->la_size = 512 * blocks;
 	/* Block size may be not set; suggest maximal I/O transfers. */
 	if (blksize == 0)
 		blksize = 1ULL << SPA_MAXBLOCKSHIFT;
@@ -1007,7 +1015,8 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
  */
 
 static void osd_ah_init(const struct lu_env *env, struct dt_allocation_hint *ah,
-			struct dt_object *parent, cfs_umode_t child_mode)
+			struct dt_object *parent, struct dt_object *child,
+			cfs_umode_t child_mode)
 {
 	LASSERT(ah);
 
@@ -1078,6 +1087,9 @@ static int osd_declare_object_create(const struct lu_env *env,
 
 	dmu_tx_hold_sa_create(oh->ot_tx, ZFS_SA_BASE_ATTR_SIZE);
 
+	__osd_xattr_declare_set(env, obj, sizeof(struct lustre_mdt_attrs),
+				XATTR_NAME_LMA, oh);
+
 	RETURN(osd_declare_quota(env, osd, attr->la_uid, attr->la_gid, 1, oh,
 				 false, NULL, false));
 }
@@ -1360,6 +1372,24 @@ static osd_obj_type_f osd_create_type_f(enum dt_format_type type)
 /*
  * Primitives for directory (i.e. ZAP) handling
  */
+static inline int osd_init_lma(const struct lu_env *env, struct osd_object *obj,
+			       const struct lu_fid *fid, struct osd_thandle *oh)
+{
+	struct osd_thread_info	*info = osd_oti_get(env);
+	struct lustre_mdt_attrs	*lma = &info->oti_mdt_attrs;
+	struct lu_buf		 buf;
+	int rc;
+
+	lustre_lma_init(lma, fid);
+	lustre_lma_swab(lma);
+	buf.lb_buf = lma;
+	buf.lb_len = sizeof(*lma);
+
+	rc = osd_xattr_set_internal(env, obj, &buf, XATTR_NAME_LMA,
+				    LU_XATTR_CREATE, oh, BYPASS_CAPA);
+
+	return rc;
+}
 
 /*
  * Concurrency: @dt is write locked.
@@ -1435,6 +1465,14 @@ static int osd_object_create(const struct lu_env *env, struct dt_object *dt,
 	LASSERT(ergo(rc == 0, dt_object_exists(dt)));
 	LASSERT(osd_invariant(obj));
 
+	rc = osd_init_lma(env, obj, fid, oh);
+	if (rc) {
+		CERROR("%s: can not set LMA on "DFID": rc = %d\n",
+		       osd->od_svname, PFID(fid), rc);
+		/* ignore errors during LMA initialization */
+		rc = 0;
+	}
+
 out:
 	cfs_up(&obj->oo_guard);
 	RETURN(rc);