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

Commit 24c03fa5 authored by Liu Bo's avatar Liu Bo Committed by Chris Mason
Browse files

Btrfs: fix a dio write regression 



This bug is introduced by commit 3b8bde746f6f9bd36a9f05f5f3b6e334318176a9
(Btrfs: lock extents as we map them in DIO).

In dio write, we should unlock the section which we didn't do IO on in case that
we fall back to buffered write.  But we need to not only unlock the section
but also cleanup reserved space for the section.

This bug was found while running xfstests 133, with this 133 no longer complains.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent bd7de2c9

fs/btrfs/inode.c

+20 −4
Original line number Original line Diff line number Diff line
@@ -5992,11 +5992,27 @@ unlock: 
	 * in the case of read we need to unlock only the end area that we

	 * in the case of read we need to unlock only the end area that we

	 * aren't using if there is any left over space.

	 * aren't using if there is any left over space.

	 */

	 */

	if (lockstart < lockend)

	if (lockstart < lockend) {

		clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,

		if (create && len < lockend - lockstart) {

				 unlock_bits, 1, 0, &cached_state, GFP_NOFS);

			clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,

	else

					 lockstart + len - 1, unlock_bits, 1, 0,

					 &cached_state, GFP_NOFS);

			/*

			 * Beside unlock, we also need to cleanup reserved space

			 * for the left range by attaching EXTENT_DO_ACCOUNTING.

			 */

			clear_extent_bit(&BTRFS_I(inode)->io_tree,

					 lockstart + len, lockend,

					 unlock_bits | EXTENT_DO_ACCOUNTING,

					 1, 0, NULL, GFP_NOFS);

		} else {

			clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,

					 lockend, unlock_bits, 1, 0,

					 &cached_state, GFP_NOFS);

		}

	} else {

		free_extent_state(cached_state);

		free_extent_state(cached_state);

	}





	free_extent_map(em);

	free_extent_map(em);