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

Btrfs: fix wrong return value of btrfs_truncate_page()

Browse Source 
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: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Miao Xie 2012-12-05 10:56:13 +00:00 committed by Chris Mason
parent 7426cc04d4
commit ac6a2b36f9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/inode.c
View File

@ -3521,11 +3521,11 @@ int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len,
if (ret) if (ret)
goto out; goto out;
ret = -ENOMEM;
again: again:
page = find_or_create_page(mapping, index, mask); page = find_or_create_page(mapping, index, mask);
if (!page) { if (!page) {
btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE); btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE);
ret = -ENOMEM;
goto out; goto out;
} }
@ -3574,7 +3574,6 @@ again:
goto out_unlock; goto out_unlock;
} }
ret = 0;
if (offset != PAGE_CACHE_SIZE) { if (offset != PAGE_CACHE_SIZE) {
if (!len) if (!len)
len = PAGE_CACHE_SIZE - offset; len = PAGE_CACHE_SIZE - offset;