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

Commit b2f9452b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux 

* 'btrfs-3.0' of git://github.com/chrismason/linux:
  Btrfs: make sure not to defrag extents past i_size
  Btrfs: fix recursive auto-defrag
parents 65112dcc f7f43cc8

fs/btrfs/ioctl.c

+10 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,16 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, 
	if (!max_to_defrag)

		max_to_defrag = last_index - 1;



	while (i <= last_index && defrag_count < max_to_defrag) {

	/*

	 * make writeback starts from i, so the defrag range can be

	 * written sequentially.

	 */

	if (i < inode->i_mapping->writeback_index)

		inode->i_mapping->writeback_index = i;



	while (i <= last_index && defrag_count < max_to_defrag &&

	       (i < (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >>

		PAGE_CACHE_SHIFT)) {

		/*

		 * make sure we stop running if someone unmounts

		 * the FS