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

Commit 2a3d84f1 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Greg Kroah-Hartman
Browse files

btrfs: Move free_pages_out label in inline extent handling branch in compress_file_range 



[ Upstream commit cecc8d9038d164eda61fbcd72520975a554ea63e ]

This label is only executed if compress_file_range fails to create an
inline extent. So move its code in the semantically related inline
extent handling branch. No functional changes.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f50a0aba

fs/btrfs/inode.c

+8 −8
Original line number Diff line number Diff line
@@ -628,7 +628,14 @@ static noinline void compress_file_range(struct inode *inode, 
						     PAGE_SET_WRITEBACK |

						     page_error_op |

						     PAGE_END_WRITEBACK);

			goto free_pages_out;



			for (i = 0; i < nr_pages; i++) {

				WARN_ON(pages[i]->mapping);

				put_page(pages[i]);

			}

			kfree(pages);



			return;

		}

	}
@@ -706,13 +713,6 @@ static noinline void compress_file_range(struct inode *inode, 
	*num_added += 1;



	return;



free_pages_out:

	for (i = 0; i < nr_pages; i++) {

		WARN_ON(pages[i]->mapping);

		put_page(pages[i]);

	}

	kfree(pages);

}



static void free_async_extent_pages(struct async_extent *async_extent)