iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hugetlbfs: remove unneeded return value of hugetlb_vmtruncate()

Browse Source 
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.

Link: https://lkml.kernel.org/r/20210208084637.47789-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Miaohe Lin 2021-02-24 12:10:25 -08:00 committed by Linus Torvalds
parent 1935ebd3cf
commit e5d319deda
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/hugetlbfs/inode.c
View File

@ -567,7 +567,7 @@ static void hugetlbfs_evict_inode(struct inode *inode)
clear_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; pgoff_t pgoff;
struct address_space *mapping = inode->i_mapping; 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); hugetlb_vmdelete_list(&mapping->i_mmap, pgoff, 0);
i_mmap_unlock_write(mapping); i_mmap_unlock_write(mapping);
remove_inode_hugepages(inode, offset, LLONG_MAX); remove_inode_hugepages(inode, offset, LLONG_MAX);
return 0;
} }
static long hugetlbfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 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)) || if ((newsize < oldsize && (info->seals & F_SEAL_SHRINK)) ||
(newsize > oldsize && (info->seals & F_SEAL_GROW))) (newsize > oldsize && (info->seals & F_SEAL_GROW)))
return -EPERM; return -EPERM;
error = hugetlb_vmtruncate(inode, newsize); hugetlb_vmtruncate(inode, newsize);
if (error)
return error;
} }
setattr_copy(&init_user_ns, inode, attr); setattr_copy(&init_user_ns, inode, attr);