Signed-off-by: Tristan Ye <[email protected]>
---
fs/ocfs2/move_extents.c | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
index 9b79ee7..d1fca9c 100644
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
@@ -220,6 +220,9 @@ out:
/*
* Using one journal handle to guarantee the data consistency in case
* crash happens anywhere.
+ *
+ * XXX: defrag can end up with finishing partial extent as requested,
+ * due to not enough contiguous clusters can be found in allocator.
*/
static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,
u32 cpos, u32 phys_cpos, u32 *len, int ext_flags)
@@ -866,9 +869,11 @@ static int __ocfs2_move_extents_range(struct buffer_head
*di_bh,
else
len_to_move = 0;
- if (do_defrag)
+ if (do_defrag) {
defrag_thresh = range->me_thresh >> osb->s_clustersize_bits;
- else
+ if (defrag_thresh <= 1)
+ goto done;
+ } else
new_phys_cpos = ocfs2_blocks_to_clusters(inode->i_sb,
range->me_goal);
@@ -940,6 +945,7 @@ next:
len_to_move -= alloc_size;
}
+done:
range->me_flags |= OCFS2_MOVE_EXT_FL_COMPLETE;
out:
@@ -1092,13 +1098,17 @@ int ocfs2_ioctl_move_extents(struct file *filp, void
__user *argp)
if (range.me_flags & OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) {
context->auto_defrag = 1;
+ /*
+ * ok, the default theshold for the defragmentation
+ * is 1M, since our maximum clustersize was 1M also.
+ * any thought?
+ */
if (!range.me_thresh)
- /*
- * ok, the default theshold for the defragmentation
- * is 1M, since our maximum clustersize was 1M also.
- * any thought?
- */
range.me_thresh = 1024 * 1024;
+
+ if (range.me_thresh > i_size_read(inode))
+ range.me_thresh = i_size_read(inode);
+
} else {
/*
* first best-effort attempt to validate and adjust the goal
--
1.5.5
_______________________________________________
Ocfs2-devel mailing list
[email protected]
http://oss.oracle.com/mailman/listinfo/ocfs2-devel
