diff options
author | Chris Mason <chris.mason@fusionio.com> | 2013-10-05 16:51:32 +0200 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-10-05 16:51:32 +0200 |
commit | 1329dfc8bb8932976844438cd5e757c720d6f1ff (patch) | |
tree | 3ee7f40236ee5fc7961e285089da255caddab38a /fs/btrfs/extent_io.c | |
parent | Linux 3.12-rc3 (diff) | |
parent | Btrfs: fix a use-after-free bug in btrfs_dev_replace_finishing (diff) | |
download | linux-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.c | 2 |
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; } /* |