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

Commit 633085c7 authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

Btrfs: reset force_compress on btrfs_file_defrag failure 



After we set force_compress with a new value (which was not being done
while holding the inode mutex), if an error happens and we jump to
the label out_ra, the force_compress property of the inode is not set
to BTRFS_COMPRESS_NONE (unlike in the case where no errors happen).

Signed-off-by: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent f420ee1e

fs/btrfs/ioctl.c

+7 −7
Original line number Diff line number Diff line
@@ -1285,9 +1285,6 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, 
			cluster = max_cluster;

		}



		if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)

			BTRFS_I(inode)->force_compress = compress_type;



		if (i + cluster > ra_index) {

			ra_index = max(i, ra_index);

			btrfs_force_ra(inode->i_mapping, ra, file, ra_index,
@@ -1296,6 +1293,8 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, 
		}



		mutex_lock(&inode->i_mutex);

		if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS)

			BTRFS_I(inode)->force_compress = compress_type;

		ret = cluster_pages_for_defrag(inode, pages, i, cluster);

		if (ret < 0) {

			mutex_unlock(&inode->i_mutex);
@@ -1352,10 +1351,6 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, 
			    atomic_read(&root->fs_info->async_delalloc_pages) == 0));

		}

		atomic_dec(&root->fs_info->async_submit_draining);



		mutex_lock(&inode->i_mutex);

		BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_NONE;

		mutex_unlock(&inode->i_mutex);

	}



	if (range->compress_type == BTRFS_COMPRESS_LZO) {
@@ -1365,6 +1360,11 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, 
	ret = defrag_count;



out_ra:

	if (range->flags & BTRFS_DEFRAG_RANGE_COMPRESS) {

		mutex_lock(&inode->i_mutex);

		BTRFS_I(inode)->force_compress = BTRFS_COMPRESS_NONE;

		mutex_unlock(&inode->i_mutex);

	}

	if (!file)

		kfree(ra);

	kfree(pages);