diff --git a/fs/nfs_common/nfsacl.c b/fs/nfs_common/nfsacl.c
index 09af1100eae7..af1d3d3bddb5 100644
--- a/fs/nfs_common/nfsacl.c
+++ b/fs/nfs_common/nfsacl.c
@@ -479,7 +479,7 @@ convert_nfs41xdr_to_nfs40_acl(u32 *xdrbuf, size_t remaining, struct nfs4_acl *ac
 	int i;
 
 	for (i = 0; i < acl->naces; i++, xdrbuf += NACE41_LEN) {
-		if (remaining < ACE4_SIZE) {
+		if (remaining < ACE4SIZE) {
 			error = -EOVERFLOW;
 			break;
 		}
@@ -488,7 +488,7 @@ convert_nfs41xdr_to_nfs40_acl(u32 *xdrbuf, size_t remaining, struct nfs4_acl *ac
 		if (error)
 			break;
 
-		remaining -= (NACE41_LEN * sizeof(u32));
+		remaining -= ACE4SIZE;
 	}
 
 	return error;