diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2014-06-12 09:39:58 +0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-06-13 20:52:28 +0400 |
| commit | 3e2426bd0eb980648449e7a2f5a23e3cd3c7725c (patch) | |
| tree | 4e08fc2ba5d9d174882ca9ad40f43327e701db4c | |
| parent | d737278091fccda77f6896012ba86c5ffb57993f (diff) | |
| download | linux-3e2426bd0eb980648449e7a2f5a23e3cd3c7725c.tar.xz | |
btrfs: fix use of uninit "ret" in end_extent_writepage()
If this condition in end_extent_writepage() is false:
if (tree->ops && tree->ops->writepage_end_io_hook)
we will then test an uninitialized "ret" at:
ret = ret < 0 ? ret : -EIO;
The test for ret is for the case where ->writepage_end_io_hook
failed, and we'd choose that ret as the error; but if
there is no ->writepage_end_io_hook, nothing sets ret.
Initializing ret to 0 should be sufficient; if
writepage_end_io_hook wasn't set, (!uptodate) means
non-zero err was passed in, so we choose -EIO in that case.
Signed-of-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Chris Mason <clm@fb.com>
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 930f23dfaa2b..23398ad430a0 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2354,7 +2354,7 @@ int end_extent_writepage(struct page *page, int err, u64 start, u64 end) { int uptodate = (err == 0); struct extent_io_tree *tree; - int ret; + int ret = 0; tree = &BTRFS_I(page->mapping->host)->io_tree; |