diff options
| author |   chandan <chandan@linux.vnet.ibm.com> | 2015-06-09 10:35:11 +0530 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2015-06-10 07:02:48 -0700 |
| commit | 070034bdf98544b23a7fcf500618fd31dec06ab2 (patch) | |
| tree | 146064f0c699fc69fdf0941014ea0916db600d9a /fs/btrfs/ioctl.c | |
| parent | Btrfs: btrfs_defrag_file: Fix ra_index computation. (diff) | |
| download | linux-dev-070034bdf98544b23a7fcf500618fd31dec06ab2.tar.xz linux-dev-070034bdf98544b23a7fcf500618fd31dec06ab2.zip | |
Btrfs: btrfs_defrag_file: Fix calculation of max_to_defrag.
max_to_defrag represents the number of pages to defrag rather than the last
page of the file range to be defragged.
Consider a file having 10 4k blocks (i.e. blocks in the range [0 - 9]). If the
defrag ioctl was invoked for the block range [3 - 6], then max_to_defrag
should actually have the value 4. Instead in the current code we end up
setting it to 6.
Now, this does not (yet) cause an issue since the first part of the while loop
condition in btrfs_defrag_file() (i.e. "i <= last_index") causes the control
to flow out of the while loop before any buggy behavior is actually caused. So
the patch just makes sure that max_to_defrag ends up having the right value
rather than fixing a bug. I did run the xfstests suite to make sure that the
code does not regress.
Changelog: v1->v2:
Provide a much descriptive commit message.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 25c422b11bdb..9041f154cc32 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1318,7 +1318,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, i = range->start >> PAGE_CACHE_SHIFT; } if (!max_to_defrag) - max_to_defrag = last_index + 1; + max_to_defrag = last_index - i + 1; /* * make writeback starts from i, so the defrag range can be |