summaryrefslogtreecommitdiff
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-10-29 15:14:31 -0400
committerChris Mason <chris.mason@oracle.com>2010-10-29 15:14:31 -0400
commit411fc6bcef54f828a5458f4730c68abdf13c6bf0 (patch)
tree89b91cd7e0d7633e9d6e386e388bd0493165f66c /fs/btrfs/extent_io.c
parentd0b678cb0a26783ab7238784f1e7e608e5caafa3 (diff)
downloadlinux-3.10-411fc6bcef54f828a5458f4730c68abdf13c6bf0.tar.gz
linux-3.10-411fc6bcef54f828a5458f4730c68abdf13c6bf0.tar.bz2
linux-3.10-411fc6bcef54f828a5458f4730c68abdf13c6bf0.zip
Btrfs: Fix variables set but not read (bugs found by gcc 4.6)
These are all the cases where a variable is set, but not read which are really bugs. - Couple of incorrect error handling fixed. - One incorrect use of a allocation policy - Some other things Still needs more review. Found by gcc 4.6's new warnings. [akpm@linux-foundation.org: fix build. Might have been bitrot] Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Chris Mason <chris.mason@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r--fs/btrfs/extent_io.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 4c639e15629..7dc31c39ca5 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2779,6 +2779,8 @@ int extent_prepare_write(struct extent_io_tree *tree,
NULL, 1,
end_bio_extent_preparewrite, 0,
0, 0);
+ if (ret && !err)
+ err = ret;
iocount++;
block_start = block_start + iosize;
} else {