X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_xattr.c;h=d1915d7747500ef80950bc36180ebcb8bac53278;hp=1a36e302a24f350839e93583dc327d5c0be74e22;hb=60a9fd37185edf57fc42bf6a5ad9b9c61fc10e14;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70

diff --git a/lustre/mdt/mdt_xattr.c b/lustre/mdt/mdt_xattr.c
index 1a36e30..d1915d7 100644
--- a/lustre/mdt/mdt_xattr.c
+++ b/lustre/mdt/mdt_xattr.c
@@ -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>
@@ -114,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;
@@ -133,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));
 
@@ -143,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));
 
@@ -213,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;
         }
@@ -229,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;
@@ -272,7 +269,7 @@ 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;
         const struct lu_env     *env  = info->mti_env;
         struct lu_buf           *buf  = &info->mti_buf;
@@ -299,7 +296,7 @@ int mdt_reint_setxattr(struct mdt_thread_info *info,
         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);
 
@@ -307,8 +304,8 @@ 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));
         }
@@ -417,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:
@@ -425,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;
 }