[commit 8185554d: fix incorrect inode acl reset] introduced a dead
code by adding a condition which can never be true to an else
branch. The condition can never be true because it is already
checked by a previous if statement which causes function to return.
Signed-off-by: Michal Nazarewicz <[email protected]>
Reviewed-By: Filipe David Borba Manana <[email protected]>
---
fs/btrfs/acl.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 0890c83..460f36b 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -225,13 +225,8 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
ret = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
if (ret < 0)
return ret;
-
- if (ret > 0) {
- /* we need an acl */
+ if (ret > 0) /* we need an acl */
ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
- } else if (ret < 0) {
- cache_no_acl(inode);
- }
} else {
cache_no_acl(inode);
}
--
1.8.4
On Wed, Jan 1, 2014 at 5:19 AM, Michal Nazarewicz <[email protected]> wrote:
> [commit 8185554d: fix incorrect inode acl reset] introduced a dead
> code by adding a condition which can never be true to an else
> branch. The condition can never be true because it is already
> checked by a previous if statement which causes function to return.
>
> Signed-off-by: Michal Nazarewicz <[email protected]>
> Reviewed-By: Filipe David Borba Manana <[email protected]>
> ---
> fs/btrfs/acl.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
> index 0890c83..460f36b 100644
> --- a/fs/btrfs/acl.c
> +++ b/fs/btrfs/acl.c
> @@ -225,13 +225,8 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
> ret = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
> if (ret < 0)
> return ret;
> -
> - if (ret > 0) {
> - /* we need an acl */
> + if (ret > 0) /* we need an acl */
> ret = btrfs_set_acl(trans, inode, acl, ACL_TYPE_ACCESS);
> - } else if (ret < 0) {
> - cache_no_acl(inode);
> - }
> } else {
> cache_no_acl(inode);
> }
> --
> 1.8.4
Hi Michal,
Josef already added this patch to btrfs-next weeks ago:
http://git.kernel.org/cgit/linux/kernel/git/josef/btrfs-next.git/commit/?id=c4a886e433dce2b902324a54ef2d13691a760312
regards,
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Filipe David Manana,
"Reasonable men adapt themselves to the world.
Unreasonable men adapt the world to themselves.
That's why all progress depends on unreasonable men."
On Wed, Jan 01, 2014 at 05:22:18PM +0100, Michal Nazarewicz wrote:
> > On Wed, Jan 1, 2014 at 5:19 AM, Michal Nazarewicz <[email protected]> wrote:
> >> [commit 8185554d: fix incorrect inode acl reset] introduced a dead
> >> code by adding a condition which can never be true to an else
> >> branch. The condition can never be true because it is already
> >> checked by a previous if statement which causes function to return.
>
> On Wed, Jan 01 2014, Filipe David Manana wrote:
> > Josef already added this patch to btrfs-next weeks ago:
> >
> > http://git.kernel.org/cgit/linux/kernel/git/josef/btrfs-next.git/commit/?id=c4a886e433dce2b902324a54ef2d13691a760312
>
> Ah, sorry for the spam then.
>
> The original thread did not mention it and this commit was not included
> in linux-next's master branch.
FYI, the patches get merged to btrfs-next without confirmations to the
mailiglist, the linux-next tree does not merge the development branches,
only when Chris publishes a branch named 'next'.
(http://linux.f-seidel.de/linux-next/pmwiki/pmwiki.php?n=Linux-next.IncludedTrees)
david