X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Ffs%2Fjffs2%2Facl.c;fp=kernel%2Ffs%2Fjffs2%2Facl.c;h=f9f86f87d32b82ddb7b78ba30c4270f3caac9a8a;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=2f7a3c09048999f4365c3e5612ffdf18e9c65d54;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/fs/jffs2/acl.c b/kernel/fs/jffs2/acl.c
index 2f7a3c090..f9f86f87d 100644
--- a/kernel/fs/jffs2/acl.c
+++ b/kernel/fs/jffs2/acl.c
@@ -235,9 +235,10 @@ int jffs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 	case ACL_TYPE_ACCESS:
 		xprefix = JFFS2_XPREFIX_ACL_ACCESS;
 		if (acl) {
-			umode_t mode = inode->i_mode;
-			rc = posix_acl_equiv_mode(acl, &mode);
-			if (rc < 0)
+			umode_t mode;
+
+			rc = posix_acl_update_mode(inode, &mode, &acl);
+			if (rc)
 				return rc;
 			if (inode->i_mode != mode) {
 				struct iattr attr;
@@ -249,8 +250,6 @@ int jffs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 				if (rc < 0)
 					return rc;
 			}
-			if (rc == 0)
-				acl = NULL;
 		}
 		break;
 	case ACL_TYPE_DEFAULT: