diff options
| author | Jeff Liu <jeff.liu@oracle.com> | 2009-12-15 07:08:28 +0100 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-12-17 12:19:44 +0100 |
| commit | f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6 (patch) | |
| tree | 1e393c45b4f3c64910ce5a25a009598c40dd5981 /fs/ocfs2/acl.c | |
| parent | ocfs2: return -EAGAIN instead of EAGAIN in dlm (diff) | |
| download | linux-f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6.tar.xz linux-f5befbbbf9b7af033c94a1df6acaf79e77a3ceb6.zip | |
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.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, 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; |