Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah...

[mv-sheeva.git] / fs / ocfs2 / alloc.c

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index ae3ea783dad77e5d7b9e9806084e8ac9dc6dd43a..ed553c60de827e0ebad24e3501e0e00d21c82cfc 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -7196,6 +7196,8 @@ static int ocfs2_trim_extent(struct super_block *sb,
        discard = le64_to_cpu(gd->bg_blkno) +
                        ocfs2_clusters_to_blocks(sb, start);
 
+       trace_ocfs2_trim_extent(sb, (unsigned long long)discard, bcount);
+
        return sb_issue_discard(sb, discard, bcount, GFP_NOFS, 0);
 }
 
@@ -7209,6 +7211,9 @@ static int ocfs2_trim_group(struct super_block *sb,
        if (le16_to_cpu(gd->bg_free_bits_count) < minbits)
                return 0;
 
+       trace_ocfs2_trim_group((unsigned long long)le64_to_cpu(gd->bg_blkno),
+                              start, max, minbits);
+
        while (start < max) {
                start = ocfs2_find_next_zero_bit(bitmap, max, start);
                if (start >= max)
@@ -7292,6 +7297,8 @@ int ocfs2_trim_fs(struct super_block *sb, struct fstrim_range *range)
        if (start + len > le32_to_cpu(main_bm->i_clusters))
                len = le32_to_cpu(main_bm->i_clusters) - start;
 
+       trace_ocfs2_trim_fs(start, len, minlen);
+
        /* Determine first and last group to examine based on start and len */
        first_group = ocfs2_which_cluster_group(main_bm_inode, start);
        if (first_group == osb->first_cluster_group_blkno)