UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: ignore unfragmented file checks in defrag when compression enabled - rebased 

Rebased on btrfs-next and retested.

Inform should_defrag_range if BTRFS_DEFRAG_RANGE_COMPRESS is set. If so, skip
checks for adjacent extents and extent size when deciding whether to defrag,
as these can prevent an uncompressed and unfragmented file from being
compressed as requested.

Signed-off-by: Andrew Mahone <andrew.mahone@gmail.com>
This commit is contained in:
Andrew Mahone 2012-06-19 21:08:32 -04:00 committed by Chris Mason
parent e4b50e14c8
commit a43a211133
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/ioctl.c
View File

@ -832,7 +832,8 @@ static bool defrag_check_next_extent(struct inode *inode, struct extent_map *em)
} }
static int should_defrag_range(struct inode *inode, u64 start, int thresh, static int should_defrag_range(struct inode *inode, u64 start, int thresh,
u64 *last_len, u64 *skip, u64 *defrag_end) u64 *last_len, u64 *skip, u64 *defrag_end,
int compress)
{ {
struct extent_map *em; struct extent_map *em;
int ret = 1; int ret = 1;
@ -863,7 +864,7 @@ static int should_defrag_range(struct inode *inode, u64 start, int thresh,
* we hit a real extent, if it is big or the next extent is not a * we hit a real extent, if it is big or the next extent is not a
* real extent, don't bother defragging it * real extent, don't bother defragging it
*/ */
if ((*last_len == 0 || *last_len >= thresh) && if (!compress && (*last_len == 0 || *last_len >= thresh) &&
(em->len >= thresh || !next_mergeable)) (em->len >= thresh || !next_mergeable))
ret = 0; ret = 0;
out: out:
@ -1145,7 +1146,8 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
if (!should_defrag_range(inode, (u64)i << PAGE_CACHE_SHIFT, if (!should_defrag_range(inode, (u64)i << PAGE_CACHE_SHIFT,
extent_thresh, &last_len, &skip, extent_thresh, &last_len, &skip,
&defrag_end)) { &defrag_end, range->flags &
BTRFS_DEFRAG_RANGE_COMPRESS)) {
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