NFS: Remove fscache specific trace points and NFS_INO_FSCACHE bit

The NFS specific trace points are no longer needed as tracing is well
covered by netfs and fscache.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Tested-by: Daire Byrne <daire@dneg.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index a778713343df156cc61ead9b489d1e4364c5f8ba..4e90ca531176d94fa232de4fab69a9eba10f6aae 100644 (file)
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -39,7 +39,6 @@
                        { BIT(NFS_INO_STALE), "STALE" }, \
                        { BIT(NFS_INO_ACL_LRU_SET), "ACL_LRU_SET" }, \
                        { BIT(NFS_INO_INVALIDATING), "INVALIDATING" }, \
-                       { BIT(NFS_INO_FSCACHE), "FSCACHE" }, \
                        { BIT(NFS_INO_LAYOUTCOMMIT), "NEED_LAYOUTCOMMIT" }, \
                        { BIT(NFS_INO_LAYOUTCOMMITTING), "LAYOUTCOMMIT" }, \
                        { BIT(NFS_INO_LAYOUTSTATS), "LAYOUTSTATS" }, \
@@ -1243,96 +1242,6 @@ TRACE_EVENT(nfs_readpage_short,
                )
 );
 
-DECLARE_EVENT_CLASS(nfs_fscache_page_event,
-               TP_PROTO(
-                       const struct inode *inode,
-                       struct page *page
-               ),
-
-               TP_ARGS(inode, page),
-
-               TP_STRUCT__entry(
-                       __field(dev_t, dev)
-                       __field(u32, fhandle)
-                       __field(u64, fileid)
-                       __field(loff_t, offset)
-               ),
-
-               TP_fast_assign(
-                       const struct nfs_inode *nfsi = NFS_I(inode);
-                       const struct nfs_fh *fh = &nfsi->fh;
-
-                       __entry->offset = page_index(page) << PAGE_SHIFT;
-                       __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
-                       __entry->fhandle = nfs_fhandle_hash(fh);
-               ),
-
-               TP_printk(
-                       "fileid=%02x:%02x:%llu fhandle=0x%08x "
-                       "offset=%lld",
-                       MAJOR(__entry->dev), MINOR(__entry->dev),
-                       (unsigned long long)__entry->fileid,
-                       __entry->fhandle,
-                       (long long)__entry->offset
-               )
-);
-DECLARE_EVENT_CLASS(nfs_fscache_page_event_done,
-               TP_PROTO(
-                       const struct inode *inode,
-                       struct page *page,
-                       int error
-               ),
-
-               TP_ARGS(inode, page, error),
-
-               TP_STRUCT__entry(
-                       __field(int, error)
-                       __field(dev_t, dev)
-                       __field(u32, fhandle)
-                       __field(u64, fileid)
-                       __field(loff_t, offset)
-               ),
-
-               TP_fast_assign(
-                       const struct nfs_inode *nfsi = NFS_I(inode);
-                       const struct nfs_fh *fh = &nfsi->fh;
-
-                       __entry->offset = page_index(page) << PAGE_SHIFT;
-                       __entry->dev = inode->i_sb->s_dev;
-                       __entry->fileid = nfsi->fileid;
-                       __entry->fhandle = nfs_fhandle_hash(fh);
-                       __entry->error = error;
-               ),
-
-               TP_printk(
-                       "fileid=%02x:%02x:%llu fhandle=0x%08x "
-                       "offset=%lld error=%d",
-                       MAJOR(__entry->dev), MINOR(__entry->dev),
-                       (unsigned long long)__entry->fileid,
-                       __entry->fhandle,
-                       (long long)__entry->offset, __entry->error
-               )
-);
-#define DEFINE_NFS_FSCACHE_PAGE_EVENT(name) \
-       DEFINE_EVENT(nfs_fscache_page_event, name, \
-                       TP_PROTO( \
-                               const struct inode *inode, \
-                               struct page *page \
-                       ), \
-                       TP_ARGS(inode, page))
-#define DEFINE_NFS_FSCACHE_PAGE_EVENT_DONE(name) \
-       DEFINE_EVENT(nfs_fscache_page_event_done, name, \
-                       TP_PROTO( \
-                               const struct inode *inode, \
-                               struct page *page, \
-                               int error \
-                       ), \
-                       TP_ARGS(inode, page, error))
-DEFINE_NFS_FSCACHE_PAGE_EVENT(nfs_fscache_read_page);
-DEFINE_NFS_FSCACHE_PAGE_EVENT_DONE(nfs_fscache_read_page_exit);
-DEFINE_NFS_FSCACHE_PAGE_EVENT(nfs_fscache_write_page);
-DEFINE_NFS_FSCACHE_PAGE_EVENT_DONE(nfs_fscache_write_page_exit);
 
 TRACE_EVENT(nfs_pgio_error,
        TP_PROTO(

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 041e79a48f7ab49d1f995588e9e8b21eb42719fa..12bb868f9a18e3f16e4665f36559f13171fca879 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -281,7 +281,6 @@ struct nfs4_copy_state {
 #define NFS_INO_ACL_LRU_SET    (2)             /* Inode is on the LRU list */
 #define NFS_INO_INVALIDATING   (3)             /* inode is being invalidated */
 #define NFS_INO_PRESERVE_UNLINKED (4)          /* preserve file if removed while open */
-#define NFS_INO_FSCACHE                (5)             /* inode can be cached by FS-Cache */
 #define NFS_INO_LAYOUTCOMMIT   (9)             /* layoutcommit required */
 #define NFS_INO_LAYOUTCOMMITTING (10)          /* layoutcommit inflight */
 #define NFS_INO_LAYOUTSTATS    (11)            /* layoutstats inflight */