Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42551ab6 authored by Josef Bacik's avatar Josef Bacik Committed by Greg Kroah-Hartman
Browse files

btrfs: only free reserved extent if we didn't insert it 



commit 49940bdd57779c78462da7aa5a8650b2fea8c2ff upstream.

When we insert the file extent once the ordered extent completes we free
the reserved extent reservation as it'll have been migrated to the
bytes_used counter.  However if we error out after this step we'll still
clear the reserved extent reservation, resulting in a negative
accounting of the reserved bytes for the block group and space info.
Fix this by only doing the free if we didn't successfully insert a file
extent for this extent.

CC: stable@vger.kernel.org # 4.14+
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7509d4f9

fs/btrfs/inode.c

+9 −1
Original line number Diff line number Diff line
@@ -2966,6 +2966,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
	bool truncated = false;

	bool range_locked = false;

	bool clear_new_delalloc_bytes = false;

	bool clear_reserved_extent = true;



	if (!test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) &&

	    !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags) &&
@@ -3069,11 +3070,13 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
						logical_len, logical_len,

						compress_type, 0, 0,

						BTRFS_FILE_EXTENT_REG);

		if (!ret)

		if (!ret) {

			clear_reserved_extent = false;

			btrfs_release_delalloc_bytes(fs_info,

						     ordered_extent->start,

						     ordered_extent->disk_len);

		}

	}

	unpin_extent_cache(&BTRFS_I(inode)->extent_tree,

			   ordered_extent->file_offset, ordered_extent->len,

			   trans->transid);
@@ -3132,8 +3135,13 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
		 * wrong we need to return the space for this ordered extent

		 * back to the allocator.  We only free the extent in the

		 * truncated case if we didn't write out the extent at all.

		 *

		 * If we made it past insert_reserved_file_extent before we

		 * errored out then we don't need to do this as the accounting

		 * has already been done.

		 */

		if ((ret || !logical_len) &&

		    clear_reserved_extent &&

		    !test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) &&

		    !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags))

			btrfs_free_reserved_extent(fs_info,