LU-2275 mdt: Avoid setting positive dispositions too early

[fs/lustre-release.git] / lustre / mdt / mdt_xattr.c

diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c
index f3b5537..8185a55 100644 (file)
--- a/lustre/mdt/mdt_xattr.c
+++ b/lustre/mdt/mdt_xattr.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,9 +43,6 @@
  * Author: Huang Hua <huanghua@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <lustre_acl.h>
@@ -88,13 +85,11 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info)
                 RETURN(-EINVAL);
         }
 
-        if (size < 0) {
-                if (size == -ENODATA)
-                        size = 0;
-                else if (size != -EOPNOTSUPP) {
-                        CDEBUG(D_INFO, "Error geting EA size: %d\n", size);
-                        RETURN(size);
-                }
+        if (size == -ENODATA) {
+                size = 0;
+        } else if (size < 0) {
+                CERROR("Error geting EA size: %d\n", size);
+                RETURN(size);
         }
 
         if (info->mti_body->eadatasize != 0 &&
@@ -102,8 +97,7 @@ static int mdt_getxattr_pack_reply(struct mdt_thread_info * info)
                 RETURN(-ERANGE);
 
         req_capsule_set_size(pill, &RMF_EADATA, RCL_SERVER,
-                             min_t(int, size, info->mti_body->eadatasize));
-
+                             info->mti_body->eadatasize == 0 ? 0 : size);
         rc = req_capsule_server_pack(pill);
         if (rc) {
                 LASSERT(rc < 0);
@@ -117,7 +111,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
 {
         struct ptlrpc_request  *req = mdt_info_req(info);
         struct mdt_export_data *med = mdt_req2med(req);
-        struct md_ucred        *uc  = mdt_ucred(info);
+       struct lu_ucred        *uc  = mdt_ucred(info);
         struct mdt_body        *reqbody;
         struct mdt_body        *repbody = NULL;
         struct md_object       *next;
@@ -136,7 +130,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
         if (reqbody == NULL)
                 RETURN(err_serious(-EFAULT));
 
-        rc = mdt_init_ucred(info, reqbody);
+       rc = mdt_init_ucred(info, reqbody);
         if (rc)
                 RETURN(err_serious(rc));
 
@@ -146,8 +140,8 @@ int mdt_getxattr(struct mdt_thread_info *info)
                 if (unlikely(!remote))
                         GOTO(out, rc = err_serious(-EINVAL));
 
-                perm = mdt_identity_get_perm(uc->mu_identity, remote,
-                                             req->rq_peer.nid);
+               perm = mdt_identity_get_perm(uc->uc_identity, remote,
+                                            req->rq_peer.nid);
                 if (!(perm & CFS_RMTACL_PERM))
                         GOTO(out, rc = err_serious(-EPERM));
 
@@ -168,6 +162,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
         if (easize == 0 || reqbody->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;
@@ -215,7 +210,7 @@ int mdt_getxattr(struct mdt_thread_info *info)
         EXIT;
 out:
         if (rc >= 0) {
-                mdt_counter_incr(req->rq_export, LPROC_MDT_GETXATTR);
+               mdt_counter_incr(req, LPROC_MDT_GETXATTR);
                 repbody->eadatasize = rc;
                 rc = 0;
         }
@@ -231,7 +226,7 @@ static int mdt_rmtlsetfacl(struct mdt_thread_info *info,
 {
         struct ptlrpc_request  *req = mdt_info_req(info);
         struct mdt_export_data *med = mdt_req2med(req);
-        struct md_ucred        *uc = mdt_ucred(info);
+       struct lu_ucred        *uc = mdt_ucred(info);
         struct lu_buf          *buf = &info->mti_buf;
         int                     rc;
         ENTRY;
@@ -274,9 +269,8 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
                        struct mdt_lock_handle *unused)
 {
         struct ptlrpc_request   *req = mdt_info_req(info);
-        struct md_ucred         *uc  = mdt_ucred(info);
+       struct lu_ucred         *uc  = mdt_ucred(info);
         struct mdt_lock_handle  *lh;
-        struct req_capsule      *pill = info->mti_pill;
         const struct lu_env     *env  = info->mti_env;
         struct lu_buf           *buf  = &info->mti_buf;
         struct mdt_reint_record *rr   = &info->mti_rr;
@@ -285,8 +279,8 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
         struct mdt_object       *obj;
         struct md_object        *child;
         __u64                    valid = attr->la_valid;
-        const char              *xattr_name;
-        int                      xattr_len = 0;
+        const char              *xattr_name = rr->rr_name;
+        int                      xattr_len = rr->rr_eadatalen;
         __u64                    lockpart;
         int                      rc;
         posix_acl_xattr_header  *new_xattr = NULL;
@@ -299,12 +293,10 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_SETXATTR))
                 RETURN(err_serious(-ENOMEM));
 
-        xattr_name = rr->rr_name;
-
         CDEBUG(D_INODE, "%s xattr %s\n",
                valid & OBD_MD_FLXATTR ? "set" : "remove", xattr_name);
 
-        rc = mdt_init_ucred_reint(info);
+       rc = mdt_init_ucred_reint(info);
         if (rc != 0)
                 RETURN(rc);
 
@@ -312,17 +304,12 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
                 if (unlikely(!remote))
                         GOTO(out, rc = err_serious(-EINVAL));
 
-                perm = mdt_identity_get_perm(uc->mu_identity, remote,
-                                             req->rq_peer.nid);
+               perm = mdt_identity_get_perm(uc->uc_identity, remote,
+                                            req->rq_peer.nid);
                 if (!(perm & CFS_RMTACL_PERM))
                         GOTO(out, rc = err_serious(-EPERM));
         }
 
-        /* various sanity check for xattr name */
-        xattr_name = req_capsule_client_get(pill, &RMF_NAME);
-        if (!xattr_name)
-                GOTO(out, rc = err_serious(-EFAULT));
-
         if (strncmp(xattr_name, XATTR_USER_PREFIX,
                     sizeof(XATTR_USER_PREFIX) - 1) == 0) {
                 if (!(req->rq_export->exp_connect_flags & OBD_CONNECT_XATTR))
@@ -339,8 +326,6 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
                     strncmp(xattr_name, XATTR_NAME_ACL_DEFAULT,
                             sizeof(XATTR_NAME_ACL_DEFAULT) - 1) == 0)) {
                 /* currently lustre limit acl access size */
-                xattr_len = req_capsule_get_size(pill, &RMF_EADATA, RCL_CLIENT);
-
                 if (xattr_len > LUSTRE_POSIX_ACL_MAX_SIZE)
                         GOTO(out, -ERANGE);
         }
@@ -380,19 +365,11 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
         attr->la_valid = LA_CTIME;
         child = mdt_object_child(obj);
         if (valid & OBD_MD_FLXATTR) {
-                char * xattr;
-
-                if (!req_capsule_field_present(pill, &RMF_EADATA, RCL_CLIENT)) {
-                        CDEBUG(D_INFO, "no xattr data supplied\n");
-                        GOTO(out_unlock, rc = -EFAULT);
-                }
+                char *xattr = (void *)rr->rr_eadata;
 
-                xattr_len = req_capsule_get_size(pill, &RMF_EADATA, RCL_CLIENT);
-                if (xattr_len) {
+                if (xattr_len > 0) {
                         int flags = 0;
 
-                        xattr = req_capsule_client_get(pill, &RMF_EADATA);
-
                         if (valid & OBD_MD_FLRMTLSETFACL) {
                                 if (unlikely(!remote))
                                         GOTO(out_unlock, rc = -EINVAL);
@@ -437,7 +414,7 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
                 rc = -EINVAL;
         }
         if (rc == 0)
-                mdt_counter_incr(req->rq_export, LPROC_MDT_SETXATTR);
+               mdt_counter_incr(req, LPROC_MDT_SETXATTR);
 
         EXIT;
 out_unlock:
@@ -445,6 +422,6 @@ out_unlock:
         if (unlikely(new_xattr != NULL))
                 lustre_posix_acl_xattr_free(new_xattr, xattr_len);
 out:
-        mdt_exit_ucred(info);
-        return rc;
+       mdt_exit_ucred(info);
+       return rc;
 }