diff options
author | Jeff Liu <jeff.liu@oracle.com> | 2009-12-15 01:08:28 -0500 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2009-12-17 06:19:44 -0500 |
commit | f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6 (patch) | |
tree | 1e393c45b4f3c64910ce5a25a009598c40dd5981 /fs | |
parent | aad1b15310b9bcd59fa81ab8f2b1513b59553ea8 (diff) |
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')
-rw-r--r-- | fs/ocfs2/acl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c index fbeaec762103..200b88109b29 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, | |||
98 | int type, | 98 | int type, |
99 | struct buffer_head *di_bh) | 99 | struct buffer_head *di_bh) |
100 | { | 100 | { |
101 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | ||
102 | int name_index; | 101 | int name_index; |
103 | char *value = NULL; | 102 | char *value = NULL; |
104 | struct posix_acl *acl; | 103 | struct posix_acl *acl; |
105 | int retval; | 104 | int retval; |
106 | 105 | ||
107 | if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL)) | ||
108 | return NULL; | ||
109 | |||
110 | switch (type) { | 106 | switch (type) { |
111 | case ACL_TYPE_ACCESS: | 107 | case ACL_TYPE_ACCESS: |
112 | name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS; | 108 | name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS; |