|
@@ -1140,12 +1140,9 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
|
|
if (!(inode->i_sb->s_flags & MS_ACTIVE))
|
|
if (!(inode->i_sb->s_flags & MS_ACTIVE))
|
|
break;
|
|
break;
|
|
|
|
|
|
- if (!newer_than &&
|
|
|
|
- !should_defrag_range(inode, (u64)i << PAGE_CACHE_SHIFT,
|
|
|
|
- PAGE_CACHE_SIZE,
|
|
|
|
- extent_thresh,
|
|
|
|
- &last_len, &skip,
|
|
|
|
- &defrag_end)) {
|
|
|
|
|
|
+ if (!should_defrag_range(inode, (u64)i << PAGE_CACHE_SHIFT,
|
|
|
|
+ PAGE_CACHE_SIZE, extent_thresh,
|
|
|
|
+ &last_len, &skip, &defrag_end)) {
|
|
unsigned long next;
|
|
unsigned long next;
|
|
/*
|
|
/*
|
|
* the should_defrag function tells us how much to skip
|
|
* the should_defrag function tells us how much to skip
|