LU-1403 ucred: ucred cleanup

[fs/lustre-release.git] / lustre / obdclass / acl.c

diff --git a/lustre/obdclass/acl.c b/lustre/obdclass/acl.c
index 7adbd59..ca7524a 100644 (file)
--- a/lustre/obdclass/acl.c
+++ b/lustre/obdclass/acl.c
@@ -93,9 +93,9 @@ static inline void lustre_posix_acl_cpu_to_le(posix_acl_xattr_entry *d,
 /*
  * Check permission based on POSIX ACL.
  */
-int lustre_posix_acl_permission(struct md_ucred *mu, struct lu_attr *la,
-                                int want, posix_acl_xattr_entry *entry,
-                                int count)
+int lustre_posix_acl_permission(struct lu_ucred *mu, struct lu_attr *la,
+                               int want, posix_acl_xattr_entry *entry,
+                               int count)
 {
         posix_acl_xattr_entry *pa, *pe, *mask_obj;
         posix_acl_xattr_entry ae, me;
@@ -109,12 +109,12 @@ int lustre_posix_acl_permission(struct md_ucred *mu, struct lu_attr *la,
                 switch (ae.e_tag) {
                 case ACL_USER_OBJ:
                         /* (May have been checked already) */
-                        if (la->la_uid == mu->mu_fsuid)
-                                goto check_perm;
+                       if (la->la_uid == mu->uc_fsuid)
+                               goto check_perm;
                         break;
                 case ACL_USER:
-                        if (ae.e_id == mu->mu_fsuid)
-                                goto mask;
+                       if (ae.e_id == mu->uc_fsuid)
+                               goto mask;
                         break;
                 case ACL_GROUP_OBJ:
                         if (lustre_in_group_p(mu, la->la_gid)) {
@@ -465,10 +465,10 @@ EXPORT_SYMBOL(lustre_posix_acl_xattr_filter);
  * @CFS_IC_UNMAPPED
  *  only unmapped ids are converted to "nobody".
  */
-int lustre_posix_acl_xattr_id2client(struct md_ucred *mu,
-                                     struct lustre_idmap_table *t,
-                                     posix_acl_xattr_header *header,
-                                     int size, int flags)
+int lustre_posix_acl_xattr_id2client(struct lu_ucred *mu,
+                                    struct lustre_idmap_table *t,
+                                    posix_acl_xattr_header *header,
+                                    int size, int flags)
 {
         int count, i;
         __u32 id;
@@ -548,9 +548,9 @@ EXPORT_SYMBOL(lustre_posix_acl_xattr_free);
  *  mapped ids are converted to server-side ones,
  *  unmapped ones cause "EPERM" error.
  */
-int lustre_ext_acl_xattr_id2server(struct md_ucred *mu,
-                                   struct lustre_idmap_table *t,
-                                   ext_acl_xattr_header *header)
+int lustre_ext_acl_xattr_id2server(struct lu_ucred *mu,
+                                  struct lustre_idmap_table *t,
+                                  ext_acl_xattr_header *header)
 
 {
         int i, count = le32_to_cpu(header->a_count);