2017-09-29 14:54:57

by Anshuman Khandual

Subject: [PATCH] mm/hugetlbfs: Remove the redundant -ENIVAL return from hugetlbfs_setattr()

There is no need to have a local return code set with -EINVAL when both the
conditions following it return error codes appropriately. Just remove the
redundant one.

Signed-off-by: Anshuman Khandual <[email protected]>
---
fs/hugetlbfs/inode.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 59073e9..cff3939 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -668,7 +668,6 @@ static int hugetlbfs_setattr(struct dentry *dentry, struct iattr *attr)
return error;

if (ia_valid & ATTR_SIZE) {
- error = -EINVAL;
if (attr->ia_size & ~huge_page_mask(h))
return -EINVAL;
error = hugetlb_vmtruncate(inode, attr->ia_size);
--
1.8.5.2

2017-09-29 17:42:41

by Mike Kravetz

Subject: Re: [PATCH] mm/hugetlbfs: Remove the redundant -ENIVAL return from hugetlbfs_setattr()

Adding akpm on Cc:

On 09/29/2017 07:54 AM, Anshuman Khandual wrote:
> There is no need to have a local return code set with -EINVAL when both the
> conditions following it return error codes appropriately. Just remove the
> redundant one.
>
> Signed-off-by: Anshuman Khandual <[email protected]>
> ---
> fs/hugetlbfs/inode.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
> index 59073e9..cff3939 100644
> --- a/fs/hugetlbfs/inode.c
> +++ b/fs/hugetlbfs/inode.c
> @@ -668,7 +668,6 @@ static int hugetlbfs_setattr(struct dentry *dentry, struct iattr *attr)
> return error;
>
> if (ia_valid & ATTR_SIZE) {
> - error = -EINVAL;
> if (attr->ia_size & ~huge_page_mask(h))
> return -EINVAL;
> error = hugetlb_vmtruncate(inode, attr->ia_size);
>

Thanks for noticing.
I would hope the compiler is smarter than the code and optimize this away.

Reviewed-by: Mike Kravetz <[email protected]>

--
Mike Kravetz