[1/1] Adding issync field to delegreturn_exit tracepoint

Commit Message

Olga Kornievskaia Oct. 12, 2015, 10:01 p.m. UTC

It'll be nice to know when we return delegations synchronously or not.

Signed-off-by: Olga Kornievskaia <[e-mail]>
---
 fs/nfs/nfs4proc.c  |  5 ++++-
 fs/nfs/nfs4trace.h | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

Patch

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f93b9cd..858c780 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5283,6 +5283,7 @@  struct nfs4_delegreturndata {
     struct inode *inode;
     bool roc;
     u32 roc_barrier;
+    int issync;
 };

 static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
@@ -5292,7 +5293,8 @@  static void nfs4_delegreturn_done(struct
rpc_task *task, void *calldata)
     if (!nfs4_sequence_done(task, &data->res.seq_res))
         return;

-    trace_nfs4_delegreturn_exit(&data->args, &data->res, task->tk_status);
+    trace_nfs4_delegreturn_exit(&data->args, &data->res, task->tk_status,
+                    data->issync);
     switch (task->tk_status) {
     case 0:
         renew_lease(data->res.server, data->timestamp);
@@ -5387,6 +5389,7 @@  static int _nfs4_proc_delegreturn(struct inode
*inode, struct rpc_cred *cred, co
     data->inode = nfs_igrab_and_active(inode);
     if (data->inode)
         data->roc = nfs4_roc(inode);
+    data->issync = issync;

     task_setup_data.callback_data = data;
     msg.rpc_argp = &data->args;
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 671cf68..be67e87 100644
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -612,29 +612,33 @@  TRACE_EVENT(nfs4_delegreturn_exit,
         TP_PROTO(
             const struct nfs4_delegreturnargs *args,
             const struct nfs4_delegreturnres *res,
-            int error
+            int error,
+            int issync
         ),

-        TP_ARGS(args, res, error),
+        TP_ARGS(args, res, error, issync),

         TP_STRUCT__entry(
             __field(dev_t, dev)
             __field(u32, fhandle)
             __field(int, error)
+            __field(int, issync)
         ),

         TP_fast_assign(
             __entry->dev = res->server->s_dev;
             __entry->fhandle = nfs_fhandle_hash(args->fhandle);
             __entry->error = error;
+            __entry->issync = issync;
         ),

         TP_printk(
-            "error=%d (%s) dev=%02x:%02x fhandle=0x%08x",
+            "error=%d (%s) dev=%02x:%02x fhandle=0x%08x issync=%d",
             __entry->error,
             show_nfsv4_errors(__entry->error),
             MAJOR(__entry->dev), MINOR(__entry->dev),
-            __entry->fhandle
+            __entry->fhandle,
+            __entry->issync
         )
 );