Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5befbbb authored by Jeff Liu's avatar Jeff Liu Committed by Joel Becker
Browse files

ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock() 



osb->s_mount_opt has already been checked against OCFS2_MOUNT_POSIX_ACL_CHECK before
calling ocfs2_get_acl_nolock() in ocfs2_init_acl() && ocfs2_get_acl(), so remove it.

Signed-off-by: default avatarJeff Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent aad1b153

fs/ocfs2/acl.c

+0 −4
Original line number Diff line number Diff line
@@ -98,15 +98,11 @@ static struct posix_acl *ocfs2_get_acl_nolock(struct inode *inode, 
					      int type,

					      struct buffer_head *di_bh)

{

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	int name_index;

	char *value = NULL;

	struct posix_acl *acl;

	int retval;



	if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))

		return NULL;



	switch (type) {

	case ACL_TYPE_ACCESS:

		name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;