diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2012-12-05 11:56:13 +0100 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-12-17 02:46:20 +0100 |
| commit | ac6a2b36f9fcfbe4865550afb6d333dec6b57578 (patch) | |
| tree | 7e6212618664d645a5954ddcd8de58267e0f916c /fs | |
| parent | Btrfs: punch hole past the end of the file (diff) | |
| download | linux-ac6a2b36f9fcfbe4865550afb6d333dec6b57578.tar.xz linux-ac6a2b36f9fcfbe4865550afb6d333dec6b57578.zip | |
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: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index bf609581c5d0..0446cbe8bcaf 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -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 @@ again: goto out_unlock; } - ret = 0; if (offset != PAGE_CACHE_SIZE) { if (!len) len = PAGE_CACHE_SIZE - offset; |