NFS: Fix show_nfs_errors macros again

[linux.git] / fs / nfs / nfs4trace.h

diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 6beb1f29134b0d709ef85d04538cf51acb43db40..9a39fd51c8e796feff6cc61cd1af980edfd3bdf5 100644 (file)
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -156,7 +156,7 @@ TRACE_DEFINE_ENUM(NFS4ERR_WRONG_TYPE);
 TRACE_DEFINE_ENUM(NFS4ERR_XDEV);
 
 #define show_nfsv4_errors(error) \
-       __print_symbolic(-(error), \
+       __print_symbolic(error, \
                { NFS4_OK, "OK" }, \
                /* Mapped by nfs4_stat_to_errno() */ \
                { EPERM, "EPERM" }, \
@@ -348,7 +348,7 @@ DECLARE_EVENT_CLASS(nfs4_clientid_event,
 
                TP_STRUCT__entry(
                        __string(dstaddr, clp->cl_hostname)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -357,8 +357,8 @@ DECLARE_EVENT_CLASS(nfs4_clientid_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) dstaddr=%s",
-                       __entry->error,
+                       "error=%ld (%s) dstaddr=%s",
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        __get_str(dstaddr)
                )
@@ -420,7 +420,7 @@ TRACE_EVENT(nfs4_sequence_done,
                        __field(unsigned int, highest_slotid)
                        __field(unsigned int, target_highest_slotid)
                        __field(unsigned int, status_flags)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -435,10 +435,10 @@ TRACE_EVENT(nfs4_sequence_done,
                        __entry->error = res->sr_status;
                ),
                TP_printk(
-                       "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u "
+                       "error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "
                        "highest_slotid=%u target_highest_slotid=%u "
                        "status_flags=%u (%s)",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        __entry->session,
                        __entry->slot_nr,
@@ -467,7 +467,7 @@ TRACE_EVENT(nfs4_cb_sequence,
                        __field(unsigned int, seq_nr)
                        __field(unsigned int, highest_slotid)
                        __field(unsigned int, cachethis)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -476,13 +476,13 @@ TRACE_EVENT(nfs4_cb_sequence,
                        __entry->seq_nr = args->csa_sequenceid;
                        __entry->highest_slotid = args->csa_highestslotid;
                        __entry->cachethis = args->csa_cachethis;
-                       __entry->error = -be32_to_cpu(status);
+                       __entry->error = be32_to_cpu(status);
                ),
 
                TP_printk(
-                       "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u "
+                       "error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "
                        "highest_slotid=%u",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        __entry->session,
                        __entry->slot_nr,
@@ -504,7 +504,7 @@ TRACE_EVENT(nfs4_cb_seqid_err,
                        __field(unsigned int, seq_nr)
                        __field(unsigned int, highest_slotid)
                        __field(unsigned int, cachethis)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -513,13 +513,13 @@ TRACE_EVENT(nfs4_cb_seqid_err,
                        __entry->seq_nr = args->csa_sequenceid;
                        __entry->highest_slotid = args->csa_highestslotid;
                        __entry->cachethis = args->csa_cachethis;
-                       __entry->error = -be32_to_cpu(status);
+                       __entry->error = be32_to_cpu(status);
                ),
 
                TP_printk(
-                       "error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u "
+                       "error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "
                        "highest_slotid=%u",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        __entry->session,
                        __entry->slot_nr,
@@ -572,18 +572,18 @@ TRACE_EVENT(nfs4_xdr_status,
 
                TP_STRUCT__entry(
                        __field(u32, op)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
                        __entry->op = op;
-                       __entry->error = -error;
+                       __entry->error = error;
                ),
 
                TP_printk(
-                       "operation %d: nfs status %d (%s)",
-                       __entry->op,
-                       __entry->error, show_nfsv4_errors(__entry->error)
+                       "error=%ld (%s) operation %d:",
+                       -__entry->error, show_nfsv4_errors(__entry->error),
+                       __entry->op
                )
 );
 
@@ -597,7 +597,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
                TP_ARGS(ctx, flags, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(unsigned int, flags)
                        __field(unsigned int, fmode)
                        __field(dev_t, dev)
@@ -615,7 +615,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
                        const struct nfs4_state *state = ctx->state;
                        const struct inode *inode = NULL;
 
-                       __entry->error = error;
+                       __entry->error = -error;
                        __entry->flags = flags;
                        __entry->fmode = (__force unsigned int)ctx->mode;
                        __entry->dev = ctx->dentry->d_sb->s_dev;
@@ -647,11 +647,11 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) flags=%d (%s) fmode=%s "
+                       "error=%ld (%s) flags=%d (%s) fmode=%s "
                        "fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "name=%02x:%02x:%llu/%s stateid=%d:0x%08x "
                        "openstateid=%d:0x%08x",
-                        __entry->error,
+                        -__entry->error,
                         show_nfsv4_errors(__entry->error),
                         __entry->flags,
                         show_open_flags(__entry->flags),
@@ -733,7 +733,7 @@ TRACE_EVENT(nfs4_close,
                        __field(u32, fhandle)
                        __field(u64, fileid)
                        __field(unsigned int, fmode)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
                ),
@@ -753,9 +753,9 @@ TRACE_EVENT(nfs4_close,
                ),
 
                TP_printk(
-                       "error=%d (%s) fmode=%s fileid=%02x:%02x:%llu "
+                       "error=%ld (%s) fmode=%s fileid=%02x:%02x:%llu "
                        "fhandle=0x%08x openstateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        __entry->fmode ?  show_fmode_flags(__entry->fmode) :
                                          "closed",
@@ -795,7 +795,7 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
                TP_ARGS(request, state, cmd, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, cmd)
                        __field(char, type)
                        __field(loff_t, start)
@@ -825,10 +825,10 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) cmd=%s:%s range=%lld:%lld "
+                       "error=%ld (%s) cmd=%s:%s range=%lld:%lld "
                        "fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "stateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        show_lock_cmd(__entry->cmd),
                        show_lock_type(__entry->type),
@@ -865,7 +865,7 @@ TRACE_EVENT(nfs4_set_lock,
                TP_ARGS(request, state, lockstateid, cmd, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, cmd)
                        __field(char, type)
                        __field(loff_t, start)
@@ -901,10 +901,10 @@ TRACE_EVENT(nfs4_set_lock,
                ),
 
                TP_printk(
-                       "error=%d (%s) cmd=%s:%s range=%lld:%lld "
+                       "error=%ld (%s) cmd=%s:%s range=%lld:%lld "
                        "fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "stateid=%d:0x%08x lockstateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        show_lock_cmd(__entry->cmd),
                        show_lock_type(__entry->type),
@@ -970,7 +970,7 @@ TRACE_EVENT(nfs4_delegreturn_exit,
                TP_STRUCT__entry(
                        __field(dev_t, dev)
                        __field(u32, fhandle)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
                ),
@@ -986,9 +986,9 @@ TRACE_EVENT(nfs4_delegreturn_exit,
                ),
 
                TP_printk(
-                       "error=%d (%s) dev=%02x:%02x fhandle=0x%08x "
+                       "error=%ld (%s) dev=%02x:%02x fhandle=0x%08x "
                        "stateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        __entry->fhandle,
@@ -1007,7 +1007,7 @@ DECLARE_EVENT_CLASS(nfs4_test_stateid_event,
                TP_ARGS(state, lsp, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(dev_t, dev)
                        __field(u32, fhandle)
                        __field(u64, fileid)
@@ -1029,9 +1029,9 @@ DECLARE_EVENT_CLASS(nfs4_test_stateid_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "stateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1064,7 +1064,7 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event,
 
                TP_STRUCT__entry(
                        __field(dev_t, dev)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(u64, dir)
                        __string(name, name->name)
                ),
@@ -1072,13 +1072,13 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event,
                TP_fast_assign(
                        __entry->dev = dir->i_sb->s_dev;
                        __entry->dir = NFS_FILEID(dir);
-                       __entry->error = error;
+                       __entry->error = -error;
                        __assign_str(name, name->name);
                ),
 
                TP_printk(
-                       "error=%d (%s) name=%02x:%02x:%llu/%s",
-                       __entry->error,
+                       "error=%ld (%s) name=%02x:%02x:%llu/%s",
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->dir,
@@ -1114,7 +1114,7 @@ TRACE_EVENT(nfs4_lookupp,
                TP_STRUCT__entry(
                        __field(dev_t, dev)
                        __field(u64, ino)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -1124,8 +1124,8 @@ TRACE_EVENT(nfs4_lookupp,
                ),
 
                TP_printk(
-                       "error=%d (%s) inode=%02x:%02x:%llu",
-                       __entry->error,
+                       "error=%ld (%s) inode=%02x:%02x:%llu",
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->ino
@@ -1145,7 +1145,7 @@ TRACE_EVENT(nfs4_rename,
 
                TP_STRUCT__entry(
                        __field(dev_t, dev)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(u64, olddir)
                        __string(oldname, oldname->name)
                        __field(u64, newdir)
@@ -1162,9 +1162,9 @@ TRACE_EVENT(nfs4_rename,
                ),
 
                TP_printk(
-                       "error=%d (%s) oldname=%02x:%02x:%llu/%s "
+                       "error=%ld (%s) oldname=%02x:%02x:%llu/%s "
                        "newname=%02x:%02x:%llu/%s",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->olddir,
@@ -1187,19 +1187,19 @@ DECLARE_EVENT_CLASS(nfs4_inode_event,
                        __field(dev_t, dev)
                        __field(u32, fhandle)
                        __field(u64, fileid)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
                        __entry->dev = inode->i_sb->s_dev;
                        __entry->fileid = NFS_FILEID(inode);
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
-                       __entry->error = error;
+                       __entry->error = error < 0 ? -error : 0;
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x",
-                       __entry->error,
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x",
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1238,7 +1238,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event,
                        __field(dev_t, dev)
                        __field(u32, fhandle)
                        __field(u64, fileid)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
                ),
@@ -1255,9 +1255,9 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "stateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1295,7 +1295,7 @@ DECLARE_EVENT_CLASS(nfs4_getattr_event,
                        __field(u32, fhandle)
                        __field(u64, fileid)
                        __field(unsigned int, valid)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -1307,9 +1307,9 @@ DECLARE_EVENT_CLASS(nfs4_getattr_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "valid=%s",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1342,7 +1342,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event,
                TP_ARGS(clp, fhandle, inode, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(dev_t, dev)
                        __field(u32, fhandle)
                        __field(u64, fileid)
@@ -1363,9 +1363,9 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "dstaddr=%s",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1397,7 +1397,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event,
                TP_ARGS(clp, fhandle, inode, stateid, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(dev_t, dev)
                        __field(u32, fhandle)
                        __field(u64, fileid)
@@ -1424,9 +1424,9 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "stateid=%d:0x%08x dstaddr=%s",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1460,7 +1460,7 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event,
                TP_ARGS(name, len, id, error),
 
                TP_STRUCT__entry(
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(u32, id)
                        __dynamic_array(char, name, len > 0 ? len + 1 : 1)
                ),
@@ -1475,8 +1475,8 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event,
                ),
 
                TP_printk(
-                       "error=%d id=%u name=%s",
-                       __entry->error,
+                       "error=%ld (%s) id=%u name=%s",
+                       -__entry->error, show_nfsv4_errors(__entry->error),
                        __entry->id,
                        __get_str(name)
                )
@@ -1509,7 +1509,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event,
                        __field(u64, fileid)
                        __field(loff_t, offset)
                        __field(size_t, count)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
                ),
@@ -1523,7 +1523,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event,
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->offset = hdr->args.offset;
                        __entry->count = hdr->args.count;
-                       __entry->error = error;
+                       __entry->error = error < 0 ? -error : 0;
                        __entry->stateid_seq =
                                be32_to_cpu(state->stateid.seqid);
                        __entry->stateid_hash =
@@ -1531,9 +1531,9 @@ DECLARE_EVENT_CLASS(nfs4_read_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "offset=%lld count=%zu stateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1569,7 +1569,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event,
                        __field(u64, fileid)
                        __field(loff_t, offset)
                        __field(size_t, count)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
                ),
@@ -1583,7 +1583,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event,
                        __entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));
                        __entry->offset = hdr->args.offset;
                        __entry->count = hdr->args.count;
-                       __entry->error = error;
+                       __entry->error = error < 0 ? -error : 0;
                        __entry->stateid_seq =
                                be32_to_cpu(state->stateid.seqid);
                        __entry->stateid_hash =
@@ -1591,9 +1591,9 @@ DECLARE_EVENT_CLASS(nfs4_write_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "offset=%lld count=%zu stateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1630,7 +1630,7 @@ DECLARE_EVENT_CLASS(nfs4_commit_event,
                        __field(u64, fileid)
                        __field(loff_t, offset)
                        __field(size_t, count)
-                       __field(int, error)
+                       __field(unsigned long, error)
                ),
 
                TP_fast_assign(
@@ -1644,9 +1644,9 @@ DECLARE_EVENT_CLASS(nfs4_commit_event,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "offset=%lld count=%zu",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,
@@ -1694,7 +1694,7 @@ TRACE_EVENT(nfs4_layoutget,
                        __field(u32, iomode)
                        __field(u64, offset)
                        __field(u64, count)
-                       __field(int, error)
+                       __field(unsigned long, error)
                        __field(int, stateid_seq)
                        __field(u32, stateid_hash)
                        __field(int, layoutstateid_seq)
@@ -1727,10 +1727,10 @@ TRACE_EVENT(nfs4_layoutget,
                ),
 
                TP_printk(
-                       "error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
+                       "error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
                        "iomode=%s offset=%llu count=%llu stateid=%d:0x%08x "
                        "layoutstateid=%d:0x%08x",
-                       __entry->error,
+                       -__entry->error,
                        show_nfsv4_errors(__entry->error),
                        MAJOR(__entry->dev), MINOR(__entry->dev),
                        (unsigned long long)__entry->fileid,