lkml.org 
[lkml]   [2010]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 46/47] nfs: trace nfs_commit_unstable_pages()
    CC: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    ---
    fs/nfs/write.c | 10 ++++--
    include/trace/events/nfs.h | 58 +++++++++++++++++++++++++++++++++++
    2 files changed, 66 insertions(+), 2 deletions(-)

    --- linux-next.orig/fs/nfs/write.c 2010-12-08 22:44:37.000000000 +0800
    +++ linux-next/fs/nfs/write.c 2010-12-08 22:44:38.000000000 +0800
    @@ -29,6 +29,9 @@
    #include "nfs4_fs.h"
    #include "fscache.h"

    +#define CREATE_TRACE_POINTS
    +#include <trace/events/nfs.h>
    +
    #define NFSDBG_FACILITY NFSDBG_PAGECACHE

    #define MIN_POOL_WRITE (32)
    @@ -1566,10 +1569,13 @@ static int nfs_commit_unstable_pages(str

    ret = nfs_commit_inode(inode, flags);
    if (ret >= 0)
    - return 0;
    + goto out;
    +
    out_mark_dirty:
    __mark_inode_dirty(inode, I_DIRTY_DATASYNC);
    - return ret;
    +out:
    + trace_nfs_commit_unstable_pages(inode, wbc, flags, ret);
    + return ret >= 0 ? 0 : ret;
    }
    #else
    static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_control *wbc)
    --- /dev/null 1970-01-01 00:00:00.000000000 +0000
    +++ linux-next/include/trace/events/nfs.h 2010-12-08 22:44:38.000000000 +0800
    @@ -0,0 +1,58 @@
    +#undef TRACE_SYSTEM
    +#define TRACE_SYSTEM nfs
    +
    +#if !defined(_TRACE_NFS_H) || defined(TRACE_HEADER_MULTI_READ)
    +#define _TRACE_NFS_H
    +
    +#include <linux/nfs_fs.h>
    +
    +
    +TRACE_EVENT(nfs_commit_unstable_pages,
    +
    + TP_PROTO(struct inode *inode,
    + struct writeback_control *wbc,
    + int sync,
    + int ret
    + ),
    +
    + TP_ARGS(inode, wbc, sync, ret),
    +
    + TP_STRUCT__entry(
    + __array(char, name, 32)
    + __field(unsigned long, ino)
    + __field(unsigned long, npages)
    + __field(unsigned long, in_commit)
    + __field(unsigned long, write_chunk)
    + __field(int, sync)
    + __field(int, ret)
    + ),
    +
    + TP_fast_assign(
    + strncpy(__entry->name,
    + dev_name(inode->i_mapping->backing_dev_info->dev), 32);
    + __entry->ino = inode->i_ino;
    + __entry->npages = NFS_I(inode)->npages;
    + __entry->in_commit =
    + atomic_long_read(&NFS_SERVER(inode)->in_commit);
    + __entry->write_chunk = wbc->per_file_limit;
    + __entry->sync = sync;
    + __entry->ret = ret;
    + ),
    +
    + TP_printk("bdi %s: ino=%lu npages=%ld "
    + "incommit=%lu write_chunk=%lu sync=%d ret=%d",
    + __entry->name,
    + __entry->ino,
    + __entry->npages,
    + __entry->in_commit,
    + __entry->write_chunk,
    + __entry->sync,
    + __entry->ret
    + )
    +);
    +
    +
    +#endif /* _TRACE_NFS_H */
    +
    +/* This part must be outside protection */
    +#include <trace/define_trace.h>



    \
     
     \ /
      Last update: 2010-12-13 07:53    [W:0.025 / U:0.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site