Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac6a2b36 authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: fix wrong return value of btrfs_truncate_page() 



ret variant may be set to 0 if we read page successfully, but it might be
released before we lock it again. On this case, if we fail to allocate a
new page, we will return 0, it is wrong, fix it.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 7426cc04

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -3521,11 +3521,11 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, 
	if (ret)

		goto out;



	ret = -ENOMEM;

again:

	page = find_or_create_page(mapping, index, mask);

	if (!page) {

		btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);

		ret = -ENOMEM;

		goto out;

	}
@@ -3574,7 +3574,6 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, 
		goto out_unlock;

	}



	ret = 0;

	if (offset != PAGE_CACHE_SIZE) {

		if (!len)

			len = PAGE_CACHE_SIZE - offset;