diff options
author | Liu Bo <bo.li.liu@oracle.com> | 2018-01-25 13:02:52 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-02-02 10:24:30 -0500 |
commit | 55237a5f2431a72435e3ed39e4306e973c0446b7 (patch) | |
tree | 6328003f97e70a6afc45872cd64e0ac5bc987c24 | |
parent | 1846430c24d66e85cc58286b3319c82cd54debb2 (diff) |
Btrfs: fix extent state leak from tree log
It's possible that btrfs_sync_log() bails out after one of the two
btrfs_write_marked_extents() which convert extent state's state bit into
EXTENT_NEED_WAIT from EXTENT_DIRTY/EXTENT_NEW, however only EXTENT_DIRTY
and EXTENT_NEW are searched by free_log_tree() so that those extent states
with EXTENT_NEED_WAIT lead to memory leak.
cc: <stable@vger.kernel.org>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/tree-log.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 1920c2149f88..79af4ae042ae 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -3026,13 +3026,14 @@ static void free_log_tree(struct btrfs_trans_handle *trans, | |||
3026 | 3026 | ||
3027 | while (1) { | 3027 | while (1) { |
3028 | ret = find_first_extent_bit(&log->dirty_log_pages, | 3028 | ret = find_first_extent_bit(&log->dirty_log_pages, |
3029 | 0, &start, &end, EXTENT_DIRTY | EXTENT_NEW, | 3029 | 0, &start, &end, |
3030 | EXTENT_DIRTY | EXTENT_NEW | EXTENT_NEED_WAIT, | ||
3030 | NULL); | 3031 | NULL); |
3031 | if (ret) | 3032 | if (ret) |
3032 | break; | 3033 | break; |
3033 | 3034 | ||
3034 | clear_extent_bits(&log->dirty_log_pages, start, end, | 3035 | clear_extent_bits(&log->dirty_log_pages, start, end, |
3035 | EXTENT_DIRTY | EXTENT_NEW); | 3036 | EXTENT_DIRTY | EXTENT_NEW | EXTENT_NEED_WAIT); |
3036 | } | 3037 | } |
3037 | 3038 | ||
3038 | /* | 3039 | /* |