* [PATCH] hugetlbfs: Remove unneeded return value of hugetlb_vmtruncate()
@ 2021-02-08 8:46 Miaohe Lin
2021-02-09 1:33 ` Mike Kravetz
2021-02-12 9:50 ` David Hildenbrand
0 siblings, 2 replies; 3+ messages in thread
From: Miaohe Lin @ 2021-02-08 8:46 UTC (permalink / raw)
To: akpm, mike.kravetz; +Cc: linux-mm, linux-kernel, linmiaohe
The function hugetlb_vmtruncate() is guaranteed to always success since
commit 7aa91e104028 ("hugetlb: allow extending ftruncate on hugetlbfs").
So we should remove the unneeded return value which is always 0.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
fs/hugetlbfs/inode.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 394da2ab08ad..701c82c36138 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -567,7 +567,7 @@ static void hugetlbfs_evict_inode(struct inode *inode)
clear_inode(inode);
}
-static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
+static void hugetlb_vmtruncate(struct inode *inode, loff_t offset)
{
pgoff_t pgoff;
struct address_space *mapping = inode->i_mapping;
@@ -582,7 +582,6 @@ static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
hugetlb_vmdelete_list(&mapping->i_mmap, pgoff, 0);
i_mmap_unlock_write(mapping);
remove_inode_hugepages(inode, offset, LLONG_MAX);
- return 0;
}
static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
@@ -781,9 +780,7 @@ static int hugetlbfs_setattr(struct user_namespace *mnt_userns,
if ((newsize < oldsize && (info->seals & F_SEAL_SHRINK)) ||
(newsize > oldsize && (info->seals & F_SEAL_GROW)))
return -EPERM;
- error = hugetlb_vmtruncate(inode, newsize);
- if (error)
- return error;
+ hugetlb_vmtruncate(inode, newsize);
}
setattr_copy(&init_user_ns, inode, attr);
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hugetlbfs: Remove unneeded return value of hugetlb_vmtruncate()
2021-02-08 8:46 [PATCH] hugetlbfs: Remove unneeded return value of hugetlb_vmtruncate() Miaohe Lin
@ 2021-02-09 1:33 ` Mike Kravetz
2021-02-12 9:50 ` David Hildenbrand
1 sibling, 0 replies; 3+ messages in thread
From: Mike Kravetz @ 2021-02-09 1:33 UTC (permalink / raw)
To: Miaohe Lin, akpm; +Cc: linux-mm, linux-kernel
On 2/8/21 12:46 AM, Miaohe Lin wrote:
> The function hugetlb_vmtruncate() is guaranteed to always success since
> commit 7aa91e104028 ("hugetlb: allow extending ftruncate on hugetlbfs").
> So we should remove the unneeded return value which is always 0.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> fs/hugetlbfs/inode.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
Thanks,
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
--
Mike Kravetz
>
> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
> index 394da2ab08ad..701c82c36138 100644
> --- a/fs/hugetlbfs/inode.c
> +++ b/fs/hugetlbfs/inode.c
> @@ -567,7 +567,7 @@ static void hugetlbfs_evict_inode(struct inode *inode)
> clear_inode(inode);
> }
>
> -static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
> +static void hugetlb_vmtruncate(struct inode *inode, loff_t offset)
> {
> pgoff_t pgoff;
> struct address_space *mapping = inode->i_mapping;
> @@ -582,7 +582,6 @@ static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
> hugetlb_vmdelete_list(&mapping->i_mmap, pgoff, 0);
> i_mmap_unlock_write(mapping);
> remove_inode_hugepages(inode, offset, LLONG_MAX);
> - return 0;
> }
>
> static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
> @@ -781,9 +780,7 @@ static int hugetlbfs_setattr(struct user_namespace *mnt_userns,
> if ((newsize < oldsize && (info->seals & F_SEAL_SHRINK)) ||
> (newsize > oldsize && (info->seals & F_SEAL_GROW)))
> return -EPERM;
> - error = hugetlb_vmtruncate(inode, newsize);
> - if (error)
> - return error;
> + hugetlb_vmtruncate(inode, newsize);
> }
>
> setattr_copy(&init_user_ns, inode, attr);
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hugetlbfs: Remove unneeded return value of hugetlb_vmtruncate()
2021-02-08 8:46 [PATCH] hugetlbfs: Remove unneeded return value of hugetlb_vmtruncate() Miaohe Lin
2021-02-09 1:33 ` Mike Kravetz
@ 2021-02-12 9:50 ` David Hildenbrand
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2021-02-12 9:50 UTC (permalink / raw)
To: Miaohe Lin, akpm, mike.kravetz; +Cc: linux-mm, linux-kernel
On 08.02.21 09:46, Miaohe Lin wrote:
> The function hugetlb_vmtruncate() is guaranteed to always success since
> commit 7aa91e104028 ("hugetlb: allow extending ftruncate on hugetlbfs").
> So we should remove the unneeded return value which is always 0.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> fs/hugetlbfs/inode.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
> index 394da2ab08ad..701c82c36138 100644
> --- a/fs/hugetlbfs/inode.c
> +++ b/fs/hugetlbfs/inode.c
> @@ -567,7 +567,7 @@ static void hugetlbfs_evict_inode(struct inode *inode)
> clear_inode(inode);
> }
>
> -static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
> +static void hugetlb_vmtruncate(struct inode *inode, loff_t offset)
> {
> pgoff_t pgoff;
> struct address_space *mapping = inode->i_mapping;
> @@ -582,7 +582,6 @@ static int hugetlb_vmtruncate(struct inode *inode, loff_t offset)
> hugetlb_vmdelete_list(&mapping->i_mmap, pgoff, 0);
> i_mmap_unlock_write(mapping);
> remove_inode_hugepages(inode, offset, LLONG_MAX);
> - return 0;
> }
>
> static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
> @@ -781,9 +780,7 @@ static int hugetlbfs_setattr(struct user_namespace *mnt_userns,
> if ((newsize < oldsize && (info->seals & F_SEAL_SHRINK)) ||
> (newsize > oldsize && (info->seals & F_SEAL_GROW)))
> return -EPERM;
> - error = hugetlb_vmtruncate(inode, newsize);
> - if (error)
> - return error;
> + hugetlb_vmtruncate(inode, newsize);
> }
>
> setattr_copy(&init_user_ns, inode, attr);
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-12 9:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-08 8:46 [PATCH] hugetlbfs: Remove unneeded return value of hugetlb_vmtruncate() Miaohe Lin
2021-02-09 1:33 ` Mike Kravetz
2021-02-12 9:50 ` David Hildenbrand
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.