Commit b2f9452b authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -1047,7 +1047,16 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, ...@@ -1047,7 +1047,16 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
if (!max_to_defrag) if (!max_to_defrag)
max_to_defrag = last_index - 1; 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 * make sure we stop running if someone unmounts
* the FS * the FS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment