convert_extent_bit can fail with -ENOMEM but nothing actually catches the errors.
This patch catches the error with BUG_ON in the caller. Signed-off-by: Jeff Mahoney <[email protected]> --- fs/btrfs/extent_io.h | 2 +- fs/btrfs/transaction.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -220,7 +220,7 @@ int set_extent_dirty(struct extent_io_tr int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end, gfp_t mask) __must_check; int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, - int bits, int clear_bits, gfp_t mask); + int bits, int clear_bits, gfp_t mask) __must_check; int set_extent_delalloc(struct extent_io_tree *tree, u64 start, u64 end, struct extent_state **cached_state, gfp_t mask); int find_first_extent_bit(struct extent_io_tree *tree, u64 start, --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -580,8 +580,9 @@ int btrfs_write_marked_extents(struct bt while (!find_first_extent_bit(dirty_pages, start, &start, &end, mark)) { - convert_extent_bit(dirty_pages, start, end, EXTENT_NEED_WAIT, mark, - GFP_NOFS); + err = convert_extent_bit(dirty_pages, start, end, + EXTENT_NEED_WAIT, mark, GFP_NOFS); + BUG_ON(err < 0); err = filemap_fdatawrite_range(mapping, start, end); if (err) werr = err; -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
