Skip to contentSkip to conversation

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

PATCH New Jeff Liu 2 participants 2 messages Dec 15, 2009 – Dec 18, 2009 OCFS2

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH 1/1 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.

---
 fs/ocfs2/acl.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
fs/ocfs2/acl.c +0 -3
index fbeaec7..42d70b7 100644
@@ -104,9 +104,6 @@ static struct posix_acl *ocfs2_get_acl_nolock(struct inode *inode,
 	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;
Signature · 1 line
1.5.4.3
#1 lore raw

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

Quoted 22 lines · Jeff Liu

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.

---
  fs/ocfs2/acl.c |    3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)
fs/ocfs2/acl.c +0 -3
index fbeaec7..42d70b7 100644
@@ -104,9 +104,6 @@ static struct posix_acl *ocfs2_get_acl_nolock(struct inode *inode,
  	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;