summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@fusionio.com>2013-10-05 16:51:32 +0200
committerChris Mason <chris.mason@fusionio.com>2013-10-05 16:51:32 +0200
commit1329dfc8bb8932976844438cd5e757c720d6f1ff (patch)
tree3ee7f40236ee5fc7961e285089da255caddab38a /fs/btrfs/extent_io.c
parentLinux 3.12-rc3 (diff)
parentBtrfs: fix a use-after-free bug in btrfs_dev_replace_finishing (diff)
downloadlinux-1329dfc8bb8932976844438cd5e757c720d6f1ff.tar.xz
linux-1329dfc8bb8932976844438cd5e757c720d6f1ff.zip
Merge branch 'for-linus' into for-linus-3.12
Diffstat (limited to '')
-rw-r--r--fs/btrfs/extent_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c09a40db53db..43feb4663f5b 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1614,7 +1614,7 @@ again:
*start = delalloc_start;
*end = delalloc_end;
free_extent_state(cached_state);
- return found;
+ return 0;
}
/*