Commit e5d319de authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds
Browse files

hugetlbfs: remove unneeded return value of hugetlb_vmtruncate() 

The function hugetlb_vmtruncate() is guaranteed to always success since
commit 7aa91e10 ("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: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1935ebd3

fs/hugetlbfs/inode.c

+2 −5
Original line number Diff line number Diff line
@@ -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);