X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Facl.c;h=fb12ce2c7c681a803a3437d0dc655645d14bc46f;hp=515ac7202ae52c1c77a6c9af1be72a3b9e0b78dc;hb=0feec5a3c7d4518d5c563739124b202a6a0a99f7;hpb=380829cbe68017a012d1f135419762924323f4f9

diff --git a/lustre/llite/acl.c b/lustre/llite/acl.c
index 515ac72..fb12ce2 100644
--- a/lustre/llite/acl.c
+++ b/lustre/llite/acl.c
@@ -44,16 +44,17 @@ struct posix_acl *ll_get_acl(struct inode *inode, int type)
 	struct posix_acl *acl = NULL;
 	ENTRY;
 
-	spin_lock(&lli->lli_lock);
+	read_lock(&lli->lli_lock);
 	/* VFS' acl_permission_check->check_acl will release the refcount */
 	acl = posix_acl_dup(lli->lli_posix_acl);
-	spin_unlock(&lli->lli_lock);
+	read_unlock(&lli->lli_lock);
 
 	RETURN(acl);
 }
 
 #ifdef HAVE_IOP_SET_ACL
-int ll_set_acl(struct inode *inode, struct posix_acl *acl, int type)
+int ll_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
+	       struct posix_acl *acl, int type)
 {
 	struct ll_sb_info *sbi = ll_i2sbi(inode);
 	struct ptlrpc_request *req = NULL;
@@ -67,7 +68,8 @@ int ll_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 	case ACL_TYPE_ACCESS:
 		name = XATTR_NAME_POSIX_ACL_ACCESS;
 		if (acl)
-			rc = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+			rc = posix_acl_update_mode(mnt_userns, inode,
+						   &inode->i_mode, &acl);
 		break;
 
 	case ACL_TYPE_DEFAULT: