From patchwork Sun Jul 22 07:46:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 172488 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2D8D92C0143 for ; Sun, 22 Jul 2012 17:39:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751193Ab2GVHjA (ORCPT ); Sun, 22 Jul 2012 03:39:00 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:36677 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751216Ab2GVHi3 (ORCPT ); Sun, 22 Jul 2012 03:38:29 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so8900821pbb.19 for ; Sun, 22 Jul 2012 00:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=SAARbuFO4/XQyroV012XX+5pKQH73f+E8gkpKOunu3s=; b=jDXnkayv6cT7WMQcJRxRATwpofoZxYqJ3hOYOjT25u2HEZ2MGHbLBAYu2bDd35xcKl 33pg9X/DMF0cdFZ5HPv0iRETRe51zOy1Q4/XH1qNIvAhe+DFbi7ieJHTxkbA50/80sZ0 /sFUiWIE7QWXwG+HyQ+Vb2SjXt+k1DiZcoWw/UdNG7yKQzNoaX6CM9vByNjFjIp+3Ruc qq4MQKvz8pEJx0EvuBhAyzLvAyi/sUvjFoM2NY379k5qzMTHiz6zYZTsr9rzWaJ9gC3d XPVeGX2eAehOfD61XR+79AZWbaqnDEVh2rRO2weLnNvvt+68H2Sd+uE80kSpoU1xXW5z rySg== Received: by 10.66.83.129 with SMTP id q1mr22828558pay.4.1342942708880; Sun, 22 Jul 2012 00:38:28 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ru10sm7481626pbc.50.2012.07.22.00.38.26 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 00:38:28 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: xiaoqiangnk@gmail.com, achender@linux.vnet.ibm.com, wenqing.lz@taobao.com Subject: [RFC][PATCH 10/10 v1] ext4: add two tracepoints in punching hole Date: Sun, 22 Jul 2012 15:46:07 +0800 Message-Id: <1342943167-12153-11-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1342943167-12153-1-git-send-email-wenqing.lz@taobao.com> References: <1342943167-12153-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu This patch adds two tracepoints in ext4_ext_punch_hole. Signed-off-by: Zheng Liu --- fs/ext4/extents.c | 3 ++ include/trace/events/ext4.h | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 2a526b4..0fb4ff5 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4529,6 +4529,8 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) loff_t first_page_offset, last_page_offset; int credits, err = 0; + trace_ext4_ext_punch_hole_enter(inode, offset, length); + mutex_lock(&inode->i_mutex); /* No need to punch hole beyond i_size */ @@ -4663,6 +4665,7 @@ out: ext4_journal_stop(handle); error: mutex_unlock(&inode->i_mutex); + trace_ext4_ext_punch_hole_exit(inode, offset, length, err); return err; } int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 5c17592..583f066 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -1312,6 +1312,59 @@ TRACE_EVENT(ext4_fallocate_exit, __entry->ret) ); +TRACE_EVENT(ext4_ext_punch_hole_enter, + TP_PROTO(struct inode *inode, loff_t offset, loff_t len), + + TP_ARGS(inode, offset, len), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( loff_t, offset ) + __field( loff_t, len ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->offset = offset; + __entry->len = len; + ), + + TP_printk("dev %d,%d ino %lu offset %lld len %lld", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + __entry->offset, __entry->len) +); + +TRACE_EVENT(ext4_ext_punch_hole_exit, + TP_PROTO(struct inode *inode, loff_t offset, + loff_t len, int err), + + TP_ARGS(inode, offset, len, err), + + TP_STRUCT__entry( + __field( dev_t, dev ) + __field( ino_t, ino ) + __field( loff_t, offset ) + __field( loff_t, len ) + __field( int, err ) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->offset = offset; + __entry->len = len; + __entry->err = err; + ), + + TP_printk("dev %d,%d ino %lu offset %lld len %lld err %d", + MAJOR(__entry->dev), MINOR(__entry->dev), + (unsigned long) __entry->ino, + __entry->offset, __entry->len, __entry->err) +); + TRACE_EVENT(ext4_unlink_enter, TP_PROTO(struct inode *parent, struct dentry *dentry),