p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Fabian Frederick 2015-02-10 14:08:43 -08:00 committed by Linus Torvalds
parent b934beaf4b
commit e6e746187d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/ocfs2/acl.c
View File

@ -245,16 +245,14 @@ int ocfs2_set_acl(handle_t *handle,
ret = posix_acl_equiv_mode(acl, &mode); ret = posix_acl_equiv_mode(acl, &mode);
if (ret < 0) if (ret < 0)
return ret; return ret;
else {
if (ret == 0)
acl = NULL;
ret = ocfs2_acl_set_mode(inode, di_bh, if (ret == 0)
handle, mode); acl = NULL;
if (ret)
return ret;
} ret = ocfs2_acl_set_mode(inode, di_bh,
handle, mode);
if (ret)
return ret;
} }
break; break;
case ACL_TYPE_DEFAULT: case ACL_TYPE_DEFAULT: