Forráskód Böngészése

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>
Fabian Frederick 10 éve
szülő
commit
e6e746187d
1 módosított fájl, 6 hozzáadás és 8 törlés
  1. 6 8
      fs/ocfs2/acl.c

+ 6 - 8
fs/ocfs2/acl.c

@@ -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,
-							 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;
 		break;
 	case ACL_TYPE_DEFAULT:
 	case ACL_TYPE_DEFAULT: