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

Commit dd7e0b7b authored by Sage Weil's avatar Sage Weil Committed by Chris Mason
Browse files

Btrfs: fix deadlock with free space handling and user transactions 



If an ioctl-initiated transaction is open, we can't force a commit during
the free space checks in order to free up pinned extents or else we
deadlock.  Just ENOSPC instead.

A more satisfying solution that reserves space for the entire user
transaction up front is forthcoming...

Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 1ab86aed

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -3168,7 +3168,7 @@ int btrfs_check_data_free_space(struct btrfs_root *root, struct inode *inode, 
		spin_unlock(&data_sinfo->lock);



		/* commit the current transaction and try again */

		if (!committed) {

		if (!committed && !root->fs_info->open_ioctl_trans) {

			committed = 1;

			trans = btrfs_join_transaction(root, 1);

			if (!trans)