]> git.baikalelectronics.ru Git - kernel.git/commitdiff
btrfs: fix use of uninit "ret" in end_extent_writepage()
authorEric Sandeen <sandeen@redhat.com>
Thu, 12 Jun 2014 05:39:58 +0000 (00:39 -0500)
committerChris Mason <clm@fb.com>
Fri, 13 Jun 2014 16:52:28 +0000 (09:52 -0700)
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>
fs/btrfs/extent_io.c

index 930f23dfaa2b475f3b8f776b1d882c19b5be1206..23398ad430a007953d2badca5fb871adf151cb07 100644 (file)
@@ -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;