summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/acl.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-02-10 23:08:43 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 23:30:28 +0100
commite6e746187dd3fc5f8d9c5dc48a12f65941841467 (patch)
treeb3a6e1e559c7bd81957646e9c12cbf35d7a6ccdf /fs/ocfs2/acl.c
parentocfs2/dlm: add missing dlm_lock_put() when recovery master down (diff)
downloadlinux-e6e746187dd3fc5f8d9c5dc48a12f65941841467.tar.xz
linux-e6e746187dd3fc5f8d9c5dc48a12f65941841467.zip
ocfs2: remove unnecessary else in ocfs2_set_acl()
else is unnecessary after return. Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2/acl.c')
-rw-r--r--fs/ocfs2/acl.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/ocfs2/acl.c b/fs/ocfs2/acl.c
index 7e8282dcea2a..c58a1bcfda0f 100644
--- a/fs/ocfs2/acl.c
+++ b/fs/ocfs2/acl.c
@@ -245,16 +245,14 @@ int ocfs2_set_acl(handle_t *handle,
ret = posix_acl_equiv_mode(acl, &mode);
if (ret < 0)
return ret;
- else {
- if (ret == 0)
- acl = NULL;
- ret = ocfs2_acl_set_mode(inode, di_bh,
- handle, mode);
- if (ret)
- return ret;
+ if (ret == 0)
+ acl = NULL;
- }
+ ret = ocfs2_acl_set_mode(inode, di_bh,
+ handle, mode);
+ if (ret)
+ return ret;
}
break;
case ACL_TYPE_DEFAULT: