Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

NFS: Improve O_DIRECT tracing

Switch the formatting to match the other NFS tracepoints.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

+9 -12
+9 -12
fs/nfs/nfstrace.h
··· 1597 1597 TP_ARGS(dreq), 1598 1598 1599 1599 TP_STRUCT__entry( 1600 - __field(const struct nfs_direct_req *, dreq) 1601 1600 __field(dev_t, dev) 1602 1601 __field(u64, fileid) 1603 1602 __field(u32, fhandle) 1604 - __field(int, ref) 1605 - __field(loff_t, io_start) 1603 + __field(loff_t, offset) 1606 1604 __field(ssize_t, count) 1607 1605 __field(ssize_t, bytes_left) 1608 1606 __field(ssize_t, error) ··· 1612 1614 const struct nfs_inode *nfsi = NFS_I(inode); 1613 1615 const struct nfs_fh *fh = &nfsi->fh; 1614 1616 1615 - __entry->dreq = dreq; 1616 1617 __entry->dev = inode->i_sb->s_dev; 1617 1618 __entry->fileid = nfsi->fileid; 1618 1619 __entry->fhandle = nfs_fhandle_hash(fh); 1619 - __entry->ref = kref_read(&dreq->kref); 1620 - __entry->io_start = dreq->io_start; 1620 + __entry->offset = dreq->io_start; 1621 1621 __entry->count = dreq->count; 1622 1622 __entry->bytes_left = dreq->bytes_left; 1623 1623 __entry->error = dreq->error; ··· 1623 1627 ), 1624 1628 1625 1629 TP_printk( 1626 - "dreq=%p fileid=%02x:%02x:%llu fhandle=0x%08x ref=%d " 1627 - "io_start=%lld count=%zd bytes_left=%zd error=%zd flags=%s", 1628 - __entry->dreq, MAJOR(__entry->dev), MINOR(__entry->dev), 1630 + "error=%zd fileid=%02x:%02x:%llu fhandle=0x%08x " 1631 + "offset=%lld count=%zd bytes_left=%zd flags=%s", 1632 + __entry->error, MAJOR(__entry->dev), 1633 + MINOR(__entry->dev), 1629 1634 (unsigned long long)__entry->fileid, 1630 - __entry->fhandle, __entry->ref, 1631 - __entry->io_start, __entry->count, __entry->bytes_left, 1632 - __entry->error, nfs_show_direct_req_flags(__entry->flags) 1635 + __entry->fhandle, __entry->offset, 1636 + __entry->count, __entry->bytes_left, 1637 + nfs_show_direct_req_flags(__entry->flags) 1633 1638 ) 1634 1639 ); 1635 1640