summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/acl.c
diff options
context:
space:
mode:
authorJeff Liu <jeff.liu@oracle.com>2009-12-15 14:08:28 +0800
committerJoel Becker <joel.becker@oracle.com>2009-12-17 03:19:44 -0800
commitf5befbbbf9b7af033c94a1df6acaf79e77a3ceb6 (patch)
tree1e393c45b4f3c64910ce5a25a009598c40dd5981 /fs/ocfs2/acl.c
parentaad1b15310b9bcd59fa81ab8f2b1513b59553ea8 (diff)
downloadop-kernel-dev-f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6.zip
op-kernel-dev-f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6.tar.gz
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: Jeff Liu <jeff.liu@oracle.com> Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/acl.c')
-rw-r--r--fs/ocfs2/acl.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index fbeaec7..200b881 100644
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -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;
OpenPOWER on IntegriCloud