Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b2095d0 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

NFS: Fix NFSv4 symbolic trace point output 



These symbolic values were not being displayed in string form.
TRACE_DEFINE_ENUM was missing in many cases. It also turns out that
__print_symbolic wants an unsigned long in the first field...

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 53b2c1cb

fs/nfs/nfs4trace.h

+313 −143
Original line number Diff line number Diff line
@@ -10,157 +10,302 @@ 


#include <linux/tracepoint.h>



TRACE_DEFINE_ENUM(EPERM);

TRACE_DEFINE_ENUM(ENOENT);

TRACE_DEFINE_ENUM(EIO);

TRACE_DEFINE_ENUM(ENXIO);

TRACE_DEFINE_ENUM(EACCES);

TRACE_DEFINE_ENUM(EEXIST);

TRACE_DEFINE_ENUM(EXDEV);

TRACE_DEFINE_ENUM(ENOTDIR);

TRACE_DEFINE_ENUM(EISDIR);

TRACE_DEFINE_ENUM(EFBIG);

TRACE_DEFINE_ENUM(ENOSPC);

TRACE_DEFINE_ENUM(EROFS);

TRACE_DEFINE_ENUM(EMLINK);

TRACE_DEFINE_ENUM(ENAMETOOLONG);

TRACE_DEFINE_ENUM(ENOTEMPTY);

TRACE_DEFINE_ENUM(EDQUOT);

TRACE_DEFINE_ENUM(ESTALE);

TRACE_DEFINE_ENUM(EBADHANDLE);

TRACE_DEFINE_ENUM(EBADCOOKIE);

TRACE_DEFINE_ENUM(ENOTSUPP);

TRACE_DEFINE_ENUM(ETOOSMALL);

TRACE_DEFINE_ENUM(EREMOTEIO);

TRACE_DEFINE_ENUM(EBADTYPE);

TRACE_DEFINE_ENUM(EAGAIN);

TRACE_DEFINE_ENUM(ELOOP);

TRACE_DEFINE_ENUM(EOPNOTSUPP);

TRACE_DEFINE_ENUM(EDEADLK);

TRACE_DEFINE_ENUM(ENOMEM);

TRACE_DEFINE_ENUM(EKEYEXPIRED);

TRACE_DEFINE_ENUM(ETIMEDOUT);

TRACE_DEFINE_ENUM(ERESTARTSYS);

TRACE_DEFINE_ENUM(ECONNREFUSED);

TRACE_DEFINE_ENUM(ECONNRESET);

TRACE_DEFINE_ENUM(ENETUNREACH);

TRACE_DEFINE_ENUM(EHOSTUNREACH);

TRACE_DEFINE_ENUM(EHOSTDOWN);

TRACE_DEFINE_ENUM(EPIPE);

TRACE_DEFINE_ENUM(EPFNOSUPPORT);

TRACE_DEFINE_ENUM(EPROTONOSUPPORT);



TRACE_DEFINE_ENUM(NFS4_OK);

TRACE_DEFINE_ENUM(NFS4ERR_ACCESS);

TRACE_DEFINE_ENUM(NFS4ERR_ATTRNOTSUPP);

TRACE_DEFINE_ENUM(NFS4ERR_ADMIN_REVOKED);

TRACE_DEFINE_ENUM(NFS4ERR_BACK_CHAN_BUSY);

TRACE_DEFINE_ENUM(NFS4ERR_BADCHAR);

TRACE_DEFINE_ENUM(NFS4ERR_BADHANDLE);

TRACE_DEFINE_ENUM(NFS4ERR_BADIOMODE);

TRACE_DEFINE_ENUM(NFS4ERR_BADLAYOUT);

TRACE_DEFINE_ENUM(NFS4ERR_BADLABEL);

TRACE_DEFINE_ENUM(NFS4ERR_BADNAME);

TRACE_DEFINE_ENUM(NFS4ERR_BADOWNER);

TRACE_DEFINE_ENUM(NFS4ERR_BADSESSION);

TRACE_DEFINE_ENUM(NFS4ERR_BADSLOT);

TRACE_DEFINE_ENUM(NFS4ERR_BADTYPE);

TRACE_DEFINE_ENUM(NFS4ERR_BADXDR);

TRACE_DEFINE_ENUM(NFS4ERR_BAD_COOKIE);

TRACE_DEFINE_ENUM(NFS4ERR_BAD_HIGH_SLOT);

TRACE_DEFINE_ENUM(NFS4ERR_BAD_RANGE);

TRACE_DEFINE_ENUM(NFS4ERR_BAD_SEQID);

TRACE_DEFINE_ENUM(NFS4ERR_BAD_SESSION_DIGEST);

TRACE_DEFINE_ENUM(NFS4ERR_BAD_STATEID);

TRACE_DEFINE_ENUM(NFS4ERR_CB_PATH_DOWN);

TRACE_DEFINE_ENUM(NFS4ERR_CLID_INUSE);

TRACE_DEFINE_ENUM(NFS4ERR_CLIENTID_BUSY);

TRACE_DEFINE_ENUM(NFS4ERR_COMPLETE_ALREADY);

TRACE_DEFINE_ENUM(NFS4ERR_CONN_NOT_BOUND_TO_SESSION);

TRACE_DEFINE_ENUM(NFS4ERR_DEADLOCK);

TRACE_DEFINE_ENUM(NFS4ERR_DEADSESSION);

TRACE_DEFINE_ENUM(NFS4ERR_DELAY);

TRACE_DEFINE_ENUM(NFS4ERR_DELEG_ALREADY_WANTED);

TRACE_DEFINE_ENUM(NFS4ERR_DELEG_REVOKED);

TRACE_DEFINE_ENUM(NFS4ERR_DENIED);

TRACE_DEFINE_ENUM(NFS4ERR_DIRDELEG_UNAVAIL);

TRACE_DEFINE_ENUM(NFS4ERR_DQUOT);

TRACE_DEFINE_ENUM(NFS4ERR_ENCR_ALG_UNSUPP);

TRACE_DEFINE_ENUM(NFS4ERR_EXIST);

TRACE_DEFINE_ENUM(NFS4ERR_EXPIRED);

TRACE_DEFINE_ENUM(NFS4ERR_FBIG);

TRACE_DEFINE_ENUM(NFS4ERR_FHEXPIRED);

TRACE_DEFINE_ENUM(NFS4ERR_FILE_OPEN);

TRACE_DEFINE_ENUM(NFS4ERR_GRACE);

TRACE_DEFINE_ENUM(NFS4ERR_HASH_ALG_UNSUPP);

TRACE_DEFINE_ENUM(NFS4ERR_INVAL);

TRACE_DEFINE_ENUM(NFS4ERR_IO);

TRACE_DEFINE_ENUM(NFS4ERR_ISDIR);

TRACE_DEFINE_ENUM(NFS4ERR_LAYOUTTRYLATER);

TRACE_DEFINE_ENUM(NFS4ERR_LAYOUTUNAVAILABLE);

TRACE_DEFINE_ENUM(NFS4ERR_LEASE_MOVED);

TRACE_DEFINE_ENUM(NFS4ERR_LOCKED);

TRACE_DEFINE_ENUM(NFS4ERR_LOCKS_HELD);

TRACE_DEFINE_ENUM(NFS4ERR_LOCK_RANGE);

TRACE_DEFINE_ENUM(NFS4ERR_MINOR_VERS_MISMATCH);

TRACE_DEFINE_ENUM(NFS4ERR_MLINK);

TRACE_DEFINE_ENUM(NFS4ERR_MOVED);

TRACE_DEFINE_ENUM(NFS4ERR_NAMETOOLONG);

TRACE_DEFINE_ENUM(NFS4ERR_NOENT);

TRACE_DEFINE_ENUM(NFS4ERR_NOFILEHANDLE);

TRACE_DEFINE_ENUM(NFS4ERR_NOMATCHING_LAYOUT);

TRACE_DEFINE_ENUM(NFS4ERR_NOSPC);

TRACE_DEFINE_ENUM(NFS4ERR_NOTDIR);

TRACE_DEFINE_ENUM(NFS4ERR_NOTEMPTY);

TRACE_DEFINE_ENUM(NFS4ERR_NOTSUPP);

TRACE_DEFINE_ENUM(NFS4ERR_NOT_ONLY_OP);

TRACE_DEFINE_ENUM(NFS4ERR_NOT_SAME);

TRACE_DEFINE_ENUM(NFS4ERR_NO_GRACE);

TRACE_DEFINE_ENUM(NFS4ERR_NXIO);

TRACE_DEFINE_ENUM(NFS4ERR_OLD_STATEID);

TRACE_DEFINE_ENUM(NFS4ERR_OPENMODE);

TRACE_DEFINE_ENUM(NFS4ERR_OP_ILLEGAL);

TRACE_DEFINE_ENUM(NFS4ERR_OP_NOT_IN_SESSION);

TRACE_DEFINE_ENUM(NFS4ERR_PERM);

TRACE_DEFINE_ENUM(NFS4ERR_PNFS_IO_HOLE);

TRACE_DEFINE_ENUM(NFS4ERR_PNFS_NO_LAYOUT);

TRACE_DEFINE_ENUM(NFS4ERR_RECALLCONFLICT);

TRACE_DEFINE_ENUM(NFS4ERR_RECLAIM_BAD);

TRACE_DEFINE_ENUM(NFS4ERR_RECLAIM_CONFLICT);

TRACE_DEFINE_ENUM(NFS4ERR_REJECT_DELEG);

TRACE_DEFINE_ENUM(NFS4ERR_REP_TOO_BIG);

TRACE_DEFINE_ENUM(NFS4ERR_REP_TOO_BIG_TO_CACHE);

TRACE_DEFINE_ENUM(NFS4ERR_REQ_TOO_BIG);

TRACE_DEFINE_ENUM(NFS4ERR_RESOURCE);

TRACE_DEFINE_ENUM(NFS4ERR_RESTOREFH);

TRACE_DEFINE_ENUM(NFS4ERR_RETRY_UNCACHED_REP);

TRACE_DEFINE_ENUM(NFS4ERR_RETURNCONFLICT);

TRACE_DEFINE_ENUM(NFS4ERR_ROFS);

TRACE_DEFINE_ENUM(NFS4ERR_SAME);

TRACE_DEFINE_ENUM(NFS4ERR_SHARE_DENIED);

TRACE_DEFINE_ENUM(NFS4ERR_SEQUENCE_POS);

TRACE_DEFINE_ENUM(NFS4ERR_SEQ_FALSE_RETRY);

TRACE_DEFINE_ENUM(NFS4ERR_SEQ_MISORDERED);

TRACE_DEFINE_ENUM(NFS4ERR_SERVERFAULT);

TRACE_DEFINE_ENUM(NFS4ERR_STALE);

TRACE_DEFINE_ENUM(NFS4ERR_STALE_CLIENTID);

TRACE_DEFINE_ENUM(NFS4ERR_STALE_STATEID);

TRACE_DEFINE_ENUM(NFS4ERR_SYMLINK);

TRACE_DEFINE_ENUM(NFS4ERR_TOOSMALL);

TRACE_DEFINE_ENUM(NFS4ERR_TOO_MANY_OPS);

TRACE_DEFINE_ENUM(NFS4ERR_UNKNOWN_LAYOUTTYPE);

TRACE_DEFINE_ENUM(NFS4ERR_UNSAFE_COMPOUND);

TRACE_DEFINE_ENUM(NFS4ERR_WRONGSEC);

TRACE_DEFINE_ENUM(NFS4ERR_WRONG_CRED);

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" }, \

		{ -ENOENT, "ENOENT" }, \

		{ -EIO, "EIO" }, \

		{ -ENXIO, "ENXIO" }, \

		{ -EACCES, "EACCES" }, \

		{ -EEXIST, "EEXIST" }, \

		{ -EXDEV, "EXDEV" }, \

		{ -ENOTDIR, "ENOTDIR" }, \

		{ -EISDIR, "EISDIR" }, \

		{ -EFBIG, "EFBIG" }, \

		{ -ENOSPC, "ENOSPC" }, \

		{ -EROFS, "EROFS" }, \

		{ -EMLINK, "EMLINK" }, \

		{ -ENAMETOOLONG, "ENAMETOOLONG" }, \

		{ -ENOTEMPTY, "ENOTEMPTY" }, \

		{ -EDQUOT, "EDQUOT" }, \

		{ -ESTALE, "ESTALE" }, \

		{ -EBADHANDLE, "EBADHANDLE" }, \

		{ -EBADCOOKIE, "EBADCOOKIE" }, \

		{ -ENOTSUPP, "ENOTSUPP" }, \

		{ -ETOOSMALL, "ETOOSMALL" }, \

		{ -EREMOTEIO, "EREMOTEIO" }, \

		{ -EBADTYPE, "EBADTYPE" }, \

		{ -EAGAIN, "EAGAIN" }, \

		{ -ELOOP, "ELOOP" }, \

		{ -EOPNOTSUPP, "EOPNOTSUPP" }, \

		{ -EDEADLK, "EDEADLK" }, \

		{ EPERM, "EPERM" }, \

		{ ENOENT, "ENOENT" }, \

		{ EIO, "EIO" }, \

		{ ENXIO, "ENXIO" }, \

		{ EACCES, "EACCES" }, \

		{ EEXIST, "EEXIST" }, \

		{ EXDEV, "EXDEV" }, \

		{ ENOTDIR, "ENOTDIR" }, \

		{ EISDIR, "EISDIR" }, \

		{ EFBIG, "EFBIG" }, \

		{ ENOSPC, "ENOSPC" }, \

		{ EROFS, "EROFS" }, \

		{ EMLINK, "EMLINK" }, \

		{ ENAMETOOLONG, "ENAMETOOLONG" }, \

		{ ENOTEMPTY, "ENOTEMPTY" }, \

		{ EDQUOT, "EDQUOT" }, \

		{ ESTALE, "ESTALE" }, \

		{ EBADHANDLE, "EBADHANDLE" }, \

		{ EBADCOOKIE, "EBADCOOKIE" }, \

		{ ENOTSUPP, "ENOTSUPP" }, \

		{ ETOOSMALL, "ETOOSMALL" }, \

		{ EREMOTEIO, "EREMOTEIO" }, \

		{ EBADTYPE, "EBADTYPE" }, \

		{ EAGAIN, "EAGAIN" }, \

		{ ELOOP, "ELOOP" }, \

		{ EOPNOTSUPP, "EOPNOTSUPP" }, \

		{ EDEADLK, "EDEADLK" }, \

		/* RPC errors */ \

		{ -ENOMEM, "ENOMEM" }, \

		{ -EKEYEXPIRED, "EKEYEXPIRED" }, \

		{ -ETIMEDOUT, "ETIMEDOUT" }, \

		{ -ERESTARTSYS, "ERESTARTSYS" }, \

		{ -ECONNREFUSED, "ECONNREFUSED" }, \

		{ -ECONNRESET, "ECONNRESET" }, \

		{ -ENETUNREACH, "ENETUNREACH" }, \

		{ -EHOSTUNREACH, "EHOSTUNREACH" }, \

		{ -EHOSTDOWN, "EHOSTDOWN" }, \

		{ -EPIPE, "EPIPE" }, \

		{ -EPFNOSUPPORT, "EPFNOSUPPORT" }, \

		{ -EPROTONOSUPPORT, "EPROTONOSUPPORT" }, \

		{ ENOMEM, "ENOMEM" }, \

		{ EKEYEXPIRED, "EKEYEXPIRED" }, \

		{ ETIMEDOUT, "ETIMEDOUT" }, \

		{ ERESTARTSYS, "ERESTARTSYS" }, \

		{ ECONNREFUSED, "ECONNREFUSED" }, \

		{ ECONNRESET, "ECONNRESET" }, \

		{ ENETUNREACH, "ENETUNREACH" }, \

		{ EHOSTUNREACH, "EHOSTUNREACH" }, \

		{ EHOSTDOWN, "EHOSTDOWN" }, \

		{ EPIPE, "EPIPE" }, \

		{ EPFNOSUPPORT, "EPFNOSUPPORT" }, \

		{ EPROTONOSUPPORT, "EPROTONOSUPPORT" }, \

		/* NFSv4 native errors */ \

		{ -NFS4ERR_ACCESS, "ACCESS" }, \

		{ -NFS4ERR_ATTRNOTSUPP, "ATTRNOTSUPP" }, \

		{ -NFS4ERR_ADMIN_REVOKED, "ADMIN_REVOKED" }, \

		{ -NFS4ERR_BACK_CHAN_BUSY, "BACK_CHAN_BUSY" }, \

		{ -NFS4ERR_BADCHAR, "BADCHAR" }, \

		{ -NFS4ERR_BADHANDLE, "BADHANDLE" }, \

		{ -NFS4ERR_BADIOMODE, "BADIOMODE" }, \

		{ -NFS4ERR_BADLAYOUT, "BADLAYOUT" }, \

		{ -NFS4ERR_BADLABEL, "BADLABEL" }, \

		{ -NFS4ERR_BADNAME, "BADNAME" }, \

		{ -NFS4ERR_BADOWNER, "BADOWNER" }, \

		{ -NFS4ERR_BADSESSION, "BADSESSION" }, \

		{ -NFS4ERR_BADSLOT, "BADSLOT" }, \

		{ -NFS4ERR_BADTYPE, "BADTYPE" }, \

		{ -NFS4ERR_BADXDR, "BADXDR" }, \

		{ -NFS4ERR_BAD_COOKIE, "BAD_COOKIE" }, \

		{ -NFS4ERR_BAD_HIGH_SLOT, "BAD_HIGH_SLOT" }, \

		{ -NFS4ERR_BAD_RANGE, "BAD_RANGE" }, \

		{ -NFS4ERR_BAD_SEQID, "BAD_SEQID" }, \

		{ -NFS4ERR_BAD_SESSION_DIGEST, "BAD_SESSION_DIGEST" }, \

		{ -NFS4ERR_BAD_STATEID, "BAD_STATEID" }, \

		{ -NFS4ERR_CB_PATH_DOWN, "CB_PATH_DOWN" }, \

		{ -NFS4ERR_CLID_INUSE, "CLID_INUSE" }, \

		{ -NFS4ERR_CLIENTID_BUSY, "CLIENTID_BUSY" }, \

		{ -NFS4ERR_COMPLETE_ALREADY, "COMPLETE_ALREADY" }, \

		{ -NFS4ERR_CONN_NOT_BOUND_TO_SESSION, \

		{ NFS4ERR_ACCESS, "ACCESS" }, \

		{ NFS4ERR_ATTRNOTSUPP, "ATTRNOTSUPP" }, \

		{ NFS4ERR_ADMIN_REVOKED, "ADMIN_REVOKED" }, \

		{ NFS4ERR_BACK_CHAN_BUSY, "BACK_CHAN_BUSY" }, \

		{ NFS4ERR_BADCHAR, "BADCHAR" }, \

		{ NFS4ERR_BADHANDLE, "BADHANDLE" }, \

		{ NFS4ERR_BADIOMODE, "BADIOMODE" }, \

		{ NFS4ERR_BADLAYOUT, "BADLAYOUT" }, \

		{ NFS4ERR_BADLABEL, "BADLABEL" }, \

		{ NFS4ERR_BADNAME, "BADNAME" }, \

		{ NFS4ERR_BADOWNER, "BADOWNER" }, \

		{ NFS4ERR_BADSESSION, "BADSESSION" }, \

		{ NFS4ERR_BADSLOT, "BADSLOT" }, \

		{ NFS4ERR_BADTYPE, "BADTYPE" }, \

		{ NFS4ERR_BADXDR, "BADXDR" }, \

		{ NFS4ERR_BAD_COOKIE, "BAD_COOKIE" }, \

		{ NFS4ERR_BAD_HIGH_SLOT, "BAD_HIGH_SLOT" }, \

		{ NFS4ERR_BAD_RANGE, "BAD_RANGE" }, \

		{ NFS4ERR_BAD_SEQID, "BAD_SEQID" }, \

		{ NFS4ERR_BAD_SESSION_DIGEST, "BAD_SESSION_DIGEST" }, \

		{ NFS4ERR_BAD_STATEID, "BAD_STATEID" }, \

		{ NFS4ERR_CB_PATH_DOWN, "CB_PATH_DOWN" }, \

		{ NFS4ERR_CLID_INUSE, "CLID_INUSE" }, \

		{ NFS4ERR_CLIENTID_BUSY, "CLIENTID_BUSY" }, \

		{ NFS4ERR_COMPLETE_ALREADY, "COMPLETE_ALREADY" }, \

		{ NFS4ERR_CONN_NOT_BOUND_TO_SESSION, \

			"CONN_NOT_BOUND_TO_SESSION" }, \

		{ -NFS4ERR_DEADLOCK, "DEADLOCK" }, \

		{ -NFS4ERR_DEADSESSION, "DEAD_SESSION" }, \

		{ -NFS4ERR_DELAY, "DELAY" }, \

		{ -NFS4ERR_DELEG_ALREADY_WANTED, \

		{ NFS4ERR_DEADLOCK, "DEADLOCK" }, \

		{ NFS4ERR_DEADSESSION, "DEAD_SESSION" }, \

		{ NFS4ERR_DELAY, "DELAY" }, \

		{ NFS4ERR_DELEG_ALREADY_WANTED, \

			"DELEG_ALREADY_WANTED" }, \

		{ -NFS4ERR_DELEG_REVOKED, "DELEG_REVOKED" }, \

		{ -NFS4ERR_DENIED, "DENIED" }, \

		{ -NFS4ERR_DIRDELEG_UNAVAIL, "DIRDELEG_UNAVAIL" }, \

		{ -NFS4ERR_DQUOT, "DQUOT" }, \

		{ -NFS4ERR_ENCR_ALG_UNSUPP, "ENCR_ALG_UNSUPP" }, \

		{ -NFS4ERR_EXIST, "EXIST" }, \

		{ -NFS4ERR_EXPIRED, "EXPIRED" }, \

		{ -NFS4ERR_FBIG, "FBIG" }, \

		{ -NFS4ERR_FHEXPIRED, "FHEXPIRED" }, \

		{ -NFS4ERR_FILE_OPEN, "FILE_OPEN" }, \

		{ -NFS4ERR_GRACE, "GRACE" }, \

		{ -NFS4ERR_HASH_ALG_UNSUPP, "HASH_ALG_UNSUPP" }, \

		{ -NFS4ERR_INVAL, "INVAL" }, \

		{ -NFS4ERR_IO, "IO" }, \

		{ -NFS4ERR_ISDIR, "ISDIR" }, \

		{ -NFS4ERR_LAYOUTTRYLATER, "LAYOUTTRYLATER" }, \

		{ -NFS4ERR_LAYOUTUNAVAILABLE, "LAYOUTUNAVAILABLE" }, \

		{ -NFS4ERR_LEASE_MOVED, "LEASE_MOVED" }, \

		{ -NFS4ERR_LOCKED, "LOCKED" }, \

		{ -NFS4ERR_LOCKS_HELD, "LOCKS_HELD" }, \

		{ -NFS4ERR_LOCK_RANGE, "LOCK_RANGE" }, \

		{ -NFS4ERR_MINOR_VERS_MISMATCH, "MINOR_VERS_MISMATCH" }, \

		{ -NFS4ERR_MLINK, "MLINK" }, \

		{ -NFS4ERR_MOVED, "MOVED" }, \

		{ -NFS4ERR_NAMETOOLONG, "NAMETOOLONG" }, \

		{ -NFS4ERR_NOENT, "NOENT" }, \

		{ -NFS4ERR_NOFILEHANDLE, "NOFILEHANDLE" }, \

		{ -NFS4ERR_NOMATCHING_LAYOUT, "NOMATCHING_LAYOUT" }, \

		{ -NFS4ERR_NOSPC, "NOSPC" }, \

		{ -NFS4ERR_NOTDIR, "NOTDIR" }, \

		{ -NFS4ERR_NOTEMPTY, "NOTEMPTY" }, \

		{ -NFS4ERR_NOTSUPP, "NOTSUPP" }, \

		{ -NFS4ERR_NOT_ONLY_OP, "NOT_ONLY_OP" }, \

		{ -NFS4ERR_NOT_SAME, "NOT_SAME" }, \

		{ -NFS4ERR_NO_GRACE, "NO_GRACE" }, \

		{ -NFS4ERR_NXIO, "NXIO" }, \

		{ -NFS4ERR_OLD_STATEID, "OLD_STATEID" }, \

		{ -NFS4ERR_OPENMODE, "OPENMODE" }, \

		{ -NFS4ERR_OP_ILLEGAL, "OP_ILLEGAL" }, \

		{ -NFS4ERR_OP_NOT_IN_SESSION, "OP_NOT_IN_SESSION" }, \

		{ -NFS4ERR_PERM, "PERM" }, \

		{ -NFS4ERR_PNFS_IO_HOLE, "PNFS_IO_HOLE" }, \

		{ -NFS4ERR_PNFS_NO_LAYOUT, "PNFS_NO_LAYOUT" }, \

		{ -NFS4ERR_RECALLCONFLICT, "RECALLCONFLICT" }, \

		{ -NFS4ERR_RECLAIM_BAD, "RECLAIM_BAD" }, \

		{ -NFS4ERR_RECLAIM_CONFLICT, "RECLAIM_CONFLICT" }, \

		{ -NFS4ERR_REJECT_DELEG, "REJECT_DELEG" }, \

		{ -NFS4ERR_REP_TOO_BIG, "REP_TOO_BIG" }, \

		{ -NFS4ERR_REP_TOO_BIG_TO_CACHE, \

		{ NFS4ERR_DELEG_REVOKED, "DELEG_REVOKED" }, \

		{ NFS4ERR_DENIED, "DENIED" }, \

		{ NFS4ERR_DIRDELEG_UNAVAIL, "DIRDELEG_UNAVAIL" }, \

		{ NFS4ERR_DQUOT, "DQUOT" }, \

		{ NFS4ERR_ENCR_ALG_UNSUPP, "ENCR_ALG_UNSUPP" }, \

		{ NFS4ERR_EXIST, "EXIST" }, \

		{ NFS4ERR_EXPIRED, "EXPIRED" }, \

		{ NFS4ERR_FBIG, "FBIG" }, \

		{ NFS4ERR_FHEXPIRED, "FHEXPIRED" }, \

		{ NFS4ERR_FILE_OPEN, "FILE_OPEN" }, \

		{ NFS4ERR_GRACE, "GRACE" }, \

		{ NFS4ERR_HASH_ALG_UNSUPP, "HASH_ALG_UNSUPP" }, \

		{ NFS4ERR_INVAL, "INVAL" }, \

		{ NFS4ERR_IO, "IO" }, \

		{ NFS4ERR_ISDIR, "ISDIR" }, \

		{ NFS4ERR_LAYOUTTRYLATER, "LAYOUTTRYLATER" }, \

		{ NFS4ERR_LAYOUTUNAVAILABLE, "LAYOUTUNAVAILABLE" }, \

		{ NFS4ERR_LEASE_MOVED, "LEASE_MOVED" }, \

		{ NFS4ERR_LOCKED, "LOCKED" }, \

		{ NFS4ERR_LOCKS_HELD, "LOCKS_HELD" }, \

		{ NFS4ERR_LOCK_RANGE, "LOCK_RANGE" }, \

		{ NFS4ERR_MINOR_VERS_MISMATCH, "MINOR_VERS_MISMATCH" }, \

		{ NFS4ERR_MLINK, "MLINK" }, \

		{ NFS4ERR_MOVED, "MOVED" }, \

		{ NFS4ERR_NAMETOOLONG, "NAMETOOLONG" }, \

		{ NFS4ERR_NOENT, "NOENT" }, \

		{ NFS4ERR_NOFILEHANDLE, "NOFILEHANDLE" }, \

		{ NFS4ERR_NOMATCHING_LAYOUT, "NOMATCHING_LAYOUT" }, \

		{ NFS4ERR_NOSPC, "NOSPC" }, \

		{ NFS4ERR_NOTDIR, "NOTDIR" }, \

		{ NFS4ERR_NOTEMPTY, "NOTEMPTY" }, \

		{ NFS4ERR_NOTSUPP, "NOTSUPP" }, \

		{ NFS4ERR_NOT_ONLY_OP, "NOT_ONLY_OP" }, \

		{ NFS4ERR_NOT_SAME, "NOT_SAME" }, \

		{ NFS4ERR_NO_GRACE, "NO_GRACE" }, \

		{ NFS4ERR_NXIO, "NXIO" }, \

		{ NFS4ERR_OLD_STATEID, "OLD_STATEID" }, \

		{ NFS4ERR_OPENMODE, "OPENMODE" }, \

		{ NFS4ERR_OP_ILLEGAL, "OP_ILLEGAL" }, \

		{ NFS4ERR_OP_NOT_IN_SESSION, "OP_NOT_IN_SESSION" }, \

		{ NFS4ERR_PERM, "PERM" }, \

		{ NFS4ERR_PNFS_IO_HOLE, "PNFS_IO_HOLE" }, \

		{ NFS4ERR_PNFS_NO_LAYOUT, "PNFS_NO_LAYOUT" }, \

		{ NFS4ERR_RECALLCONFLICT, "RECALLCONFLICT" }, \

		{ NFS4ERR_RECLAIM_BAD, "RECLAIM_BAD" }, \

		{ NFS4ERR_RECLAIM_CONFLICT, "RECLAIM_CONFLICT" }, \

		{ NFS4ERR_REJECT_DELEG, "REJECT_DELEG" }, \

		{ NFS4ERR_REP_TOO_BIG, "REP_TOO_BIG" }, \

		{ NFS4ERR_REP_TOO_BIG_TO_CACHE, \

			"REP_TOO_BIG_TO_CACHE" }, \

		{ -NFS4ERR_REQ_TOO_BIG, "REQ_TOO_BIG" }, \

		{ -NFS4ERR_RESOURCE, "RESOURCE" }, \

		{ -NFS4ERR_RESTOREFH, "RESTOREFH" }, \

		{ -NFS4ERR_RETRY_UNCACHED_REP, "RETRY_UNCACHED_REP" }, \

		{ -NFS4ERR_RETURNCONFLICT, "RETURNCONFLICT" }, \

		{ -NFS4ERR_ROFS, "ROFS" }, \

		{ -NFS4ERR_SAME, "SAME" }, \

		{ -NFS4ERR_SHARE_DENIED, "SHARE_DENIED" }, \

		{ -NFS4ERR_SEQUENCE_POS, "SEQUENCE_POS" }, \

		{ -NFS4ERR_SEQ_FALSE_RETRY, "SEQ_FALSE_RETRY" }, \

		{ -NFS4ERR_SEQ_MISORDERED, "SEQ_MISORDERED" }, \

		{ -NFS4ERR_SERVERFAULT, "SERVERFAULT" }, \

		{ -NFS4ERR_STALE, "STALE" }, \

		{ -NFS4ERR_STALE_CLIENTID, "STALE_CLIENTID" }, \

		{ -NFS4ERR_STALE_STATEID, "STALE_STATEID" }, \

		{ -NFS4ERR_SYMLINK, "SYMLINK" }, \

		{ -NFS4ERR_TOOSMALL, "TOOSMALL" }, \

		{ -NFS4ERR_TOO_MANY_OPS, "TOO_MANY_OPS" }, \

		{ -NFS4ERR_UNKNOWN_LAYOUTTYPE, "UNKNOWN_LAYOUTTYPE" }, \

		{ -NFS4ERR_UNSAFE_COMPOUND, "UNSAFE_COMPOUND" }, \

		{ -NFS4ERR_WRONGSEC, "WRONGSEC" }, \

		{ -NFS4ERR_WRONG_CRED, "WRONG_CRED" }, \

		{ -NFS4ERR_WRONG_TYPE, "WRONG_TYPE" }, \

		{ -NFS4ERR_XDEV, "XDEV" })

		{ NFS4ERR_REQ_TOO_BIG, "REQ_TOO_BIG" }, \

		{ NFS4ERR_RESOURCE, "RESOURCE" }, \

		{ NFS4ERR_RESTOREFH, "RESTOREFH" }, \

		{ NFS4ERR_RETRY_UNCACHED_REP, "RETRY_UNCACHED_REP" }, \

		{ NFS4ERR_RETURNCONFLICT, "RETURNCONFLICT" }, \

		{ NFS4ERR_ROFS, "ROFS" }, \

		{ NFS4ERR_SAME, "SAME" }, \

		{ NFS4ERR_SHARE_DENIED, "SHARE_DENIED" }, \

		{ NFS4ERR_SEQUENCE_POS, "SEQUENCE_POS" }, \

		{ NFS4ERR_SEQ_FALSE_RETRY, "SEQ_FALSE_RETRY" }, \

		{ NFS4ERR_SEQ_MISORDERED, "SEQ_MISORDERED" }, \

		{ NFS4ERR_SERVERFAULT, "SERVERFAULT" }, \

		{ NFS4ERR_STALE, "STALE" }, \

		{ NFS4ERR_STALE_CLIENTID, "STALE_CLIENTID" }, \

		{ NFS4ERR_STALE_STATEID, "STALE_STATEID" }, \

		{ NFS4ERR_SYMLINK, "SYMLINK" }, \

		{ NFS4ERR_TOOSMALL, "TOOSMALL" }, \

		{ NFS4ERR_TOO_MANY_OPS, "TOO_MANY_OPS" }, \

		{ NFS4ERR_UNKNOWN_LAYOUTTYPE, "UNKNOWN_LAYOUTTYPE" }, \

		{ NFS4ERR_UNSAFE_COMPOUND, "UNSAFE_COMPOUND" }, \

		{ NFS4ERR_WRONGSEC, "WRONGSEC" }, \

		{ NFS4ERR_WRONG_CRED, "WRONG_CRED" }, \

		{ NFS4ERR_WRONG_TYPE, "WRONG_TYPE" }, \

		{ NFS4ERR_XDEV, "XDEV" })



#define show_open_flags(flags) \

	__print_flags(flags, "|", \
@@ -558,6 +703,13 @@ TRACE_EVENT(nfs4_close, 
		)

);



TRACE_DEFINE_ENUM(F_GETLK);

TRACE_DEFINE_ENUM(F_SETLK);

TRACE_DEFINE_ENUM(F_SETLKW);

TRACE_DEFINE_ENUM(F_RDLCK);

TRACE_DEFINE_ENUM(F_WRLCK);

TRACE_DEFINE_ENUM(F_UNLCK);



#define show_lock_cmd(type) \

	__print_symbolic((int)type, \

		{ F_GETLK, "GETLK" }, \
@@ -1451,6 +1603,10 @@ DEFINE_NFS4_COMMIT_EVENT(nfs4_commit); 
#ifdef CONFIG_NFS_V4_1

DEFINE_NFS4_COMMIT_EVENT(nfs4_pnfs_commit_ds);



TRACE_DEFINE_ENUM(IOMODE_READ);

TRACE_DEFINE_ENUM(IOMODE_RW);

TRACE_DEFINE_ENUM(IOMODE_ANY);



#define show_pnfs_iomode(iomode) \

	__print_symbolic(iomode, \

		{ IOMODE_READ, "READ" }, \
@@ -1528,6 +1684,20 @@ DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutcommit); 
DEFINE_NFS4_INODE_STATEID_EVENT(nfs4_layoutreturn);

DEFINE_NFS4_INODE_EVENT(nfs4_layoutreturn_on_close);



TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_UNKNOWN);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_NO_PNFS);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_RD_ZEROLEN);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_MDSTHRESH);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_NOMEM);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_BULK_RECALL);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_IO_TEST_FAIL);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_FOUND_CACHED);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_RETURN);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_BLOCKED);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_INVALID_OPEN);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_RETRY);

TRACE_DEFINE_ENUM(PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET);



#define show_pnfs_update_layout_reason(reason)				\

	__print_symbolic(reason,					\

		{ PNFS_UPDATE_LAYOUT_UNKNOWN, "unknown" },		\