X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_object.c;h=498d3b262fc2be999a3cd88087e087e72b6d69c1;hb=0603cc1a773dbe72f520e856743ef40fd7dfa1af;hp=6df7eb1807d042c6503f516939d85d87bf680d74;hpb=681101c0a1eceed0caa6fc5b7e748ba868e436cf;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 6df7eb1..498d3b2 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -58,73 +58,73 @@
  */
 
 static int vvp_object_print(const struct lu_env *env, void *cookie,
-                            lu_printer_t p, const struct lu_object *o)
+			    lu_printer_t p, const struct lu_object *o)
 {
-        struct ccc_object    *obj   = lu2ccc(o);
-        struct inode         *inode = obj->cob_inode;
-        struct ll_inode_info *lli;
-
-        (*p)(env, cookie, "(%s %d %d) inode: %p ",
-             cfs_list_empty(&obj->cob_pending_list) ? "-" : "+",
-             obj->cob_transient_pages, cfs_atomic_read(&obj->cob_mmap_cnt),
-             inode);
-        if (inode) {
-                lli = ll_i2info(inode);
-                (*p)(env, cookie, "%lu/%u %o %u %d %p "DFID,
-                     inode->i_ino, inode->i_generation, inode->i_mode,
-                     inode->i_nlink, atomic_read(&inode->i_count),
-                     lli->lli_clob, PFID(&lli->lli_fid));
-        }
-        return 0;
+	struct ccc_object    *obj   = lu2ccc(o);
+	struct inode         *inode = obj->cob_inode;
+	struct ll_inode_info *lli;
+
+	(*p)(env, cookie, "(%s %d %d) inode: %p ",
+	     list_empty(&obj->cob_pending_list) ? "-" : "+",
+	     obj->cob_transient_pages, atomic_read(&obj->cob_mmap_cnt),
+	     inode);
+	if (inode) {
+		lli = ll_i2info(inode);
+		(*p)(env, cookie, "%lu/%u %o %u %d %p "DFID,
+		     inode->i_ino, inode->i_generation, inode->i_mode,
+		     inode->i_nlink, atomic_read(&inode->i_count),
+		     lli->lli_clob, PFID(&lli->lli_fid));
+	}
+	return 0;
 }
 
 static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
                         struct cl_attr *attr)
 {
-        struct inode *inode = ccc_object_inode(obj);
-
-        /*
-         * lov overwrites most of these fields in
-         * lov_attr_get()->...lov_merge_lvb_kms(), except when inode
-         * attributes are newer.
-         */
-
-        attr->cat_size = i_size_read(inode);
-        attr->cat_mtime = LTIME_S(inode->i_mtime);
-        attr->cat_atime = LTIME_S(inode->i_atime);
-        attr->cat_ctime = LTIME_S(inode->i_ctime);
-        attr->cat_blocks = inode->i_blocks;
-        attr->cat_uid = inode->i_uid;
-        attr->cat_gid = inode->i_gid;
-        /* KMS is not known by this layer */
-        return 0; /* layers below have to fill in the rest */
+	struct inode *inode = ccc_object_inode(obj);
+
+	/*
+	 * lov overwrites most of these fields in
+	 * lov_attr_get()->...lov_merge_lvb_kms(), except when inode
+	 * attributes are newer.
+	 */
+
+	attr->cat_size = i_size_read(inode);
+	attr->cat_mtime = LTIME_S(inode->i_mtime);
+	attr->cat_atime = LTIME_S(inode->i_atime);
+	attr->cat_ctime = LTIME_S(inode->i_ctime);
+	attr->cat_blocks = inode->i_blocks;
+	attr->cat_uid = from_kuid(&init_user_ns, inode->i_uid);
+	attr->cat_gid = from_kgid(&init_user_ns, inode->i_gid);
+	/* KMS is not known by this layer */
+	return 0; /* layers below have to fill in the rest */
 }
 
 static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
                         const struct cl_attr *attr, unsigned valid)
 {
-        struct inode *inode = ccc_object_inode(obj);
-
-        if (valid & CAT_UID)
-                inode->i_uid = attr->cat_uid;
-        if (valid & CAT_GID)
-                inode->i_gid = attr->cat_gid;
-        if (valid & CAT_ATIME)
-                LTIME_S(inode->i_atime) = attr->cat_atime;
-        if (valid & CAT_MTIME)
-                LTIME_S(inode->i_mtime) = attr->cat_mtime;
-        if (valid & CAT_CTIME)
-                LTIME_S(inode->i_ctime) = attr->cat_ctime;
-        if (0 && valid & CAT_SIZE)
-                cl_isize_write_nolock(inode, attr->cat_size);
-        /* not currently necessary */
-        if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE))
-                mark_inode_dirty(inode);
-        return 0;
+	struct inode *inode = ccc_object_inode(obj);
+
+	if (valid & CAT_UID)
+		inode->i_uid = make_kuid(&init_user_ns, attr->cat_uid);
+	if (valid & CAT_GID)
+		inode->i_gid = make_kgid(&init_user_ns, attr->cat_gid);
+	if (valid & CAT_ATIME)
+		LTIME_S(inode->i_atime) = attr->cat_atime;
+	if (valid & CAT_MTIME)
+		LTIME_S(inode->i_mtime) = attr->cat_mtime;
+	if (valid & CAT_CTIME)
+		LTIME_S(inode->i_ctime) = attr->cat_ctime;
+	if (0 && valid & CAT_SIZE)
+		cl_isize_write_nolock(inode, attr->cat_size);
+	/* not currently necessary */
+	if (0 && valid & (CAT_UID|CAT_GID|CAT_SIZE))
+		mark_inode_dirty(inode);
+	return 0;
 }
 
-int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
-		const struct cl_object_conf *conf)
+static int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
+			const struct cl_object_conf *conf)
 {
 	struct ll_inode_info *lli = ll_i2info(conf->coc_inode);
 
@@ -144,26 +144,6 @@ int vvp_conf_set(const struct lu_env *env, struct cl_object *obj,
 		 * a price themselves. */
 		unmap_mapping_range(conf->coc_inode->i_mapping,
 				    0, OBD_OBJECT_EOF, 0);
-
-		return 0;
-	}
-
-	if (conf->coc_opc != OBJECT_CONF_SET)
-		return 0;
-
-	if (conf->u.coc_md != NULL && conf->u.coc_md->lsm != NULL) {
-		CDEBUG(D_VFSTRACE, DFID ": layout version change: %u -> %u\n",
-		       PFID(&lli->lli_fid), lli->lli_layout_gen,
-		       conf->u.coc_md->lsm->lsm_layout_gen);
-
-		lli->lli_has_smd = lsm_has_objects(conf->u.coc_md->lsm);
-		ll_layout_version_set(lli, conf->u.coc_md->lsm->lsm_layout_gen);
-	} else {
-		CDEBUG(D_VFSTRACE, DFID ": layout nuked: %u.\n",
-		       PFID(&lli->lli_fid), lli->lli_layout_gen);
-
-		lli->lli_has_smd = false;
-		ll_layout_version_set(lli, LL_LAYOUT_GEN_EMPTY);
 	}
 	return 0;
 }