X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=8364fab80a2703c4e55ac7dfa4bc13cbf602f5ba;hp=55f052010e43c701ddd3e298f712fbb76a47eb7a;hb=b425c1f4ab1aa9c914acf2d6b500817259a240e9;hpb=006f258300e38ffb2cb45dfd374914a9624c07db

diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c
index 55f0520..8364fab 100644
--- a/lustre/mdt/mdt_xattr.c
+++ b/lustre/mdt/mdt_xattr.c
@@ -45,6 +45,9 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
+#include <linux/xattr.h>
+#include <obd_class.h>
+#include <lustre_nodemap.h>
 #include <lustre_acl.h>
 #include "mdt_internal.h"
 
@@ -63,7 +66,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info)
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_GETXATTR_PACK))
                 RETURN(-ENOMEM);
 
-	valid = info->mti_body->valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS);
+	valid = info->mti_body->mbo_valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS);
 
         /* Determine how many bytes we need */
         if (valid == OBD_MD_FLXATTR) {
@@ -86,23 +89,25 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info)
 		/* N.B. eadatasize = 0 is not valid for FLXATTRALL */
 		/* We could calculate accurate sizes, but this would
 		 * introduce a lot of overhead, let's do it later... */
-		size = info->mti_body->eadatasize;
+		size = info->mti_body->mbo_eadatasize;
 		req_capsule_set_size(pill, &RMF_EAVALS, RCL_SERVER, size);
 		req_capsule_set_size(pill, &RMF_EAVALS_LENS, RCL_SERVER, size);
-        } else {
-                CDEBUG(D_INFO, "Valid bits: "LPX64"\n", info->mti_body->valid);
+	} else {
+		CDEBUG(D_INFO, "Valid bits: "LPX64"\n",
+		       info->mti_body->mbo_valid);
                 RETURN(-EINVAL);
         }
 
-        if (size == -ENODATA) {
-                size = 0;
-        } else if (size < 0) {
-                CERROR("Error geting EA size: %d\n", size);
-                RETURN(size);
-        }
+	if (size == -ENODATA) {
+		size = 0;
+	} else if (size < 0) {
+		if (size != -EOPNOTSUPP)
+			CERROR("Error geting EA size: %d\n", size);
+		RETURN(size);
+	}
 
         req_capsule_set_size(pill, &RMF_EADATA, RCL_SERVER,
-                             info->mti_body->eadatasize == 0 ? 0 : size);
+			     info->mti_body->mbo_eadatasize == 0 ? 0 : size);
         rc = req_capsule_server_pack(pill);
         if (rc) {
                 LASSERT(rc < 0);
@@ -126,15 +131,13 @@ mdt_getxattr_one(struct mdt_thread_info *info,
 	CDEBUG(D_INODE, "getxattr %s\n", xattr_name);
 
 	rc = mo_xattr_get(info->mti_env, next, buf, xattr_name);
-	if (rc < 0) {
-		CERROR("getxattr failed: %d\n", rc);
+	if (rc < 0)
 		GOTO(out, rc);
-	}
 
-	if (info->mti_body->valid &
+	if (info->mti_body->mbo_valid &
 	    (OBD_MD_FLRMTLSETFACL | OBD_MD_FLRMTLGETFACL))
 		flags = CFS_IC_ALL;
-	else if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL)
+	else if (info->mti_body->mbo_valid & OBD_MD_FLRMTRGETFACL)
 		flags = CFS_IC_MAPPED;
 
 	if (rc > 0 && flags != CFS_IC_NOTHING) {
@@ -191,7 +194,7 @@ static int mdt_getxattr_all(struct mdt_thread_info *info,
 	/* Fill out EAVALS and EAVALS_LENS */
 	for (b = eadatahead; b < eadatatail; b += strlen(b) + 1, v += rc) {
 		buf->lb_buf = v;
-		buf->lb_len = reqbody->eadatasize - eavallen;
+		buf->lb_len = reqbody->mbo_eadatasize - eavallen;
 		rc = mdt_getxattr_one(info, b, next, buf, med, uc);
 		if (rc < 0)
 			GOTO(out, rc);
@@ -201,8 +204,8 @@ static int mdt_getxattr_all(struct mdt_thread_info *info,
 		eavallen += rc;
 	}
 
-	repbody->aclsize = eavallen;
-	repbody->max_mdsize = eavallens;
+	repbody->mbo_aclsize = eavallen;
+	repbody->mbo_max_mdsize = eavallens;
 
 	req_capsule_shrink(info->mti_pill, &RMF_EAVALS, eavallen, RCL_SERVER);
 	req_capsule_shrink(info->mti_pill, &RMF_EAVALS_LENS,
@@ -232,7 +235,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
         LASSERT(info->mti_object != NULL);
 	LASSERT(lu_object_assert_exists(&info->mti_object->mot_obj));
 
-        CDEBUG(D_INODE, "getxattr "DFID"\n", PFID(&info->mti_body->fid1));
+	CDEBUG(D_INODE, "getxattr "DFID"\n", PFID(&info->mti_body->mbo_fid1));
 
         reqbody = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY);
         if (reqbody == NULL)
@@ -244,7 +247,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
 
         next = mdt_object_child(info->mti_object);
 
-        if (info->mti_body->valid & OBD_MD_FLRMTRGETFACL) {
+	if (info->mti_body->mbo_valid & OBD_MD_FLRMTRGETFACL) {
                 if (unlikely(!remote))
                         GOTO(out, rc = err_serious(-EINVAL));
 
@@ -267,14 +270,14 @@ int mdt_getxattr(struct mdt_thread_info *info)
         LASSERT(repbody != NULL);
 
         /* No need further getxattr. */
-        if (easize == 0 || reqbody->eadatasize == 0)
-                GOTO(out, rc = easize);
+	if (easize == 0 || reqbody->mbo_eadatasize == 0)
+		GOTO(out, rc = easize);
 
-        buf = &info->mti_buf;
-        buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_EADATA);
-        buf->lb_len = easize;
+	buf = &info->mti_buf;
+	buf->lb_buf = req_capsule_server_get(info->mti_pill, &RMF_EADATA);
+	buf->lb_len = easize;
 
-	valid = info->mti_body->valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS);
+	valid = info->mti_body->mbo_valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLS);
 
 	if (valid == OBD_MD_FLXATTR) {
 		char *xattr_name = req_capsule_client_get(info->mti_pill,
@@ -296,7 +299,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
 out:
 	if (rc >= 0) {
 		mdt_counter_incr(req, LPROC_MDT_GETXATTR);
-		repbody->eadatasize = rc;
+		repbody->mbo_eadatasize = rc;
 		rc = 0;
 	}
 	mdt_exit_ucred(info);
@@ -353,30 +356,32 @@ _out:
 int mdt_reint_setxattr(struct mdt_thread_info *info,
                        struct mdt_lock_handle *unused)
 {
-	struct ptlrpc_request   *req = mdt_info_req(info);
-	struct lu_ucred         *uc  = lu_ucred(info->mti_env);
-        struct mdt_lock_handle  *lh;
-        const struct lu_env     *env  = info->mti_env;
-        struct lu_buf           *buf  = &info->mti_buf;
-        struct mdt_reint_record *rr   = &info->mti_rr;
-        struct md_attr          *ma = &info->mti_attr;
-        struct lu_attr          *attr = &info->mti_attr.ma_attr;
-        struct mdt_object       *obj;
-        struct md_object        *child;
-        __u64                    valid = attr->la_valid;
+	struct ptlrpc_request	*req = mdt_info_req(info);
+	struct lu_ucred		*uc  = lu_ucred(info->mti_env);
+	struct mdt_lock_handle	*lh;
+	const struct lu_env	*env  = info->mti_env;
+	struct lu_buf		*buf  = &info->mti_buf;
+	struct mdt_reint_record	*rr   = &info->mti_rr;
+	struct md_attr		*ma = &info->mti_attr;
+	struct lu_attr		*attr = &info->mti_attr.ma_attr;
+	struct mdt_object	*obj;
+	struct md_object	*child;
+	struct obd_export	*exp = info->mti_exp;
+	struct lu_nodemap	*nodemap = exp->exp_target_data.ted_nodemap;
+	__u64			 valid = attr->la_valid;
 	const char		*xattr_name = rr->rr_name.ln_name;
-        int                      xattr_len = rr->rr_eadatalen;
-        __u64                    lockpart;
-        int                      rc;
-        posix_acl_xattr_header  *new_xattr = NULL;
-        __u32                    remote = exp_connect_rmtclient(info->mti_exp);
-        __u32                    perm;
-        ENTRY;
+	int			 xattr_len = rr->rr_eadatalen;
+	__u64			 lockpart;
+	int			 rc;
+	posix_acl_xattr_header	*new_xattr = NULL;
+	__u32			 remote = exp_connect_rmtclient(info->mti_exp);
+	__u32			 perm;
+	ENTRY;
 
         CDEBUG(D_INODE, "setxattr for "DFID"\n", PFID(rr->rr_fid1));
 
 	if (info->mti_dlm_req)
-		ldlm_request_cancel(req, info->mti_dlm_req, 0);
+		ldlm_request_cancel(req, info->mti_dlm_req, 0, LATF_SKIP);
 
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SETXATTR))
                 RETURN(err_serious(-ENOMEM));
@@ -418,12 +423,27 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
 		    strcmp(xattr_name, XATTR_NAME_HSM) == 0 ||
 		    strcmp(xattr_name, XATTR_NAME_LFSCK_NAMESPACE) == 0)
 			GOTO(out, rc = 0);
+
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
+		if (strcmp(xattr_name, XATTR_NAME_LFSCK_NAMESPACE_OLD) == 0)
+			GOTO(out, rc = 0);
+#endif
 	} else if ((valid & OBD_MD_FLXATTR) &&
 		   (strcmp(xattr_name, XATTR_NAME_ACL_ACCESS) == 0 ||
 		    strcmp(xattr_name, XATTR_NAME_ACL_DEFAULT) == 0)) {
+
 		/* currently lustre limit acl access size */
 		if (xattr_len > LUSTRE_POSIX_ACL_MAX_SIZE)
 			GOTO(out, rc = -ERANGE);
+
+		rc = nodemap_map_acl(nodemap, rr->rr_eadata, xattr_len,
+				     NODEMAP_CLIENT_TO_FS);
+		if (rc < 0)
+			GOTO(out, rc);
+
+		/* ACLs were mapped out, return an error so the user knows */
+		if (rc != xattr_len)
+			GOTO(out, rc = -EPERM);
 	}
 
         lockpart = MDS_INODELOCK_UPDATE;
@@ -446,8 +466,8 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
          * to cancel them. */
         mdt_lock_reg_init(lh, LCK_EX);
         obj = mdt_object_find_lock(info, rr->rr_fid1, lh, lockpart);
-        if (IS_ERR(obj))
-                GOTO(out, rc =  PTR_ERR(obj));
+	if (IS_ERR(obj))
+		GOTO(out, rc = PTR_ERR(obj));
 
 	tgt_vbr_obj_set(env, mdt_obj2dt(obj));
 	rc = mdt_version_get_check_save(info, obj, 0);
@@ -463,10 +483,10 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
 		      PFID(rr->rr_fid1), valid);
 		attr->la_ctime = cfs_time_current_sec();
 	}
-        attr->la_valid = LA_CTIME;
-        child = mdt_object_child(obj);
-        if (valid & OBD_MD_FLXATTR) {
-                char *xattr = (void *)rr->rr_eadata;
+	attr->la_valid = LA_CTIME;
+	child = mdt_object_child(obj);
+	if (valid & OBD_MD_FLXATTR) {
+		char *xattr = rr->rr_eadata;
 
                 if (xattr_len > 0) {
                         int flags = 0;