nfs/localio: make trace_nfs_local_open_fh more useful

Always trigger trace event when LOCALIO opens a file.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>

diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c
index 97abf62f109d2e9bf20fe2759e30d4e50baaab05..42ea50d42c9951d0cd167b596c35ad8c425d206b 100644 (file)
--- a/fs/nfs/localio.c
+++ b/fs/nfs/localio.c
@@ -231,13 +231,13 @@ __nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,
                    struct nfsd_file __rcu **pnf,
                    const fmode_t mode)
 {
+       int status = 0;
        struct nfsd_file *localio;
 
        localio = nfs_open_local_fh(&clp->cl_uuid, clp->cl_rpcclient,
                                    cred, fh, nfl, pnf, mode);
        if (IS_ERR(localio)) {
-               int status = PTR_ERR(localio);
-               trace_nfs_local_open_fh(fh, mode, status);
+               status = PTR_ERR(localio);
                switch (status) {
                case -ENOMEM:
                case -ENXIO:
@@ -247,6 +247,7 @@ __nfs_local_open_fh(struct nfs_client *clp, const struct cred *cred,
                        nfs_local_probe(clp);
                }
        }
+       trace_nfs_local_open_fh(fh, mode, status);
        return localio;
 }
 

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 1356ce10236acb3c9b8324baecc5fe5daeafcde5..b51f0fa9e9afebac9a2d7497264e86a87f35982f 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -1846,10 +1846,10 @@ TRACE_EVENT(nfs_local_open_fh,
                ),
 
                TP_printk(
-                       "error=%d fhandle=0x%08x mode=%s",
-                       __entry->error,
+                       "fhandle=0x%08x mode=%s result=%d",
                        __entry->fhandle,
-                       show_fs_fmode_flags(__entry->fmode)
+                       show_fs_fmode_flags(__entry->fmode),
+                       __entry->error
                )
 );