diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-13 18:20:40 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-13 18:20:40 +1200 |
| commit | b2f9452bd5234d573898bbda52a410b154f8f510 (patch) | |
| tree | b2599fdd3247befb52f9b5c64b99aed6f6db195e | |
| parent | 65112dccf8a113737684366349d7f9ec373ddc47 (diff) | |
| parent | f7f43cc84152e53b5687cd0eb8823310ba065524 (diff) | |
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
| -rw-r--r-- | fs/btrfs/ioctl.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 538f65a79ec5..dae5dfe41ba5 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -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 |