|
@@ -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:
|