netfs: Remove NETFS_COPY_TO_CACHE

Remove NETFS_COPY_TO_CACHE as it isn't used anymore.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20240814203850.2240469-10-dhowells@redhat.com/
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/netfs/main.c b/fs/netfs/main.c
index 5f0f438e5d211d85de06f2c41d1d98144f404639..1ee712bb3610e7636d76d5445f91c452b0452b1a 100644 (file)
--- a/fs/netfs/main.c
+++ b/fs/netfs/main.c
@@ -37,11 +37,10 @@ static const char *netfs_origins[nr__netfs_io_origin] = {
        [NETFS_READAHEAD]               = "RA",
        [NETFS_READPAGE]                = "RP",
        [NETFS_READ_FOR_WRITE]          = "RW",
-       [NETFS_COPY_TO_CACHE]           = "CC",
+       [NETFS_DIO_READ]                = "DR",
        [NETFS_WRITEBACK]               = "WB",
        [NETFS_WRITETHROUGH]            = "WT",
        [NETFS_UNBUFFERED_WRITE]        = "UW",
-       [NETFS_DIO_READ]                = "DR",
        [NETFS_DIO_WRITE]               = "DW",
 };
 

diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index 37f8ce9c028417926f85171bc91f87f2ce1a0404..63ab2c775a2186734286b44bc86cf6b1d17aaba6 100644 (file)
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -207,11 +207,10 @@ enum netfs_io_origin {
        NETFS_READAHEAD,                /* This read was triggered by readahead */
        NETFS_READPAGE,                 /* This read is a synchronous read */
        NETFS_READ_FOR_WRITE,           /* This read is to prepare a write */
-       NETFS_COPY_TO_CACHE,            /* This write is to copy a read to the cache */
+       NETFS_DIO_READ,                 /* This is a direct I/O read */
        NETFS_WRITEBACK,                /* This write was triggered by writepages */
        NETFS_WRITETHROUGH,             /* This write was made by netfs_perform_write() */
        NETFS_UNBUFFERED_WRITE,         /* This is an unbuffered write */
-       NETFS_DIO_READ,                 /* This is a direct I/O read */
        NETFS_DIO_WRITE,                /* This is a direct I/O write */
        nr__netfs_io_origin
 } __mode(byte);

diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h
index f4105b8e5894f200aec7ef016d6c0dfee728ff3b..47cd11aaccac12c5b51d68f7bdc9d2965673471d 100644 (file)
--- a/include/trace/events/netfs.h
+++ b/include/trace/events/netfs.h
@@ -34,11 +34,10 @@
        EM(NETFS_READAHEAD,                     "RA")           \
        EM(NETFS_READPAGE,                      "RP")           \
        EM(NETFS_READ_FOR_WRITE,                "RW")           \
-       EM(NETFS_COPY_TO_CACHE,                 "CC")           \
+       EM(NETFS_DIO_READ,                      "DR")           \
        EM(NETFS_WRITEBACK,                     "WB")           \
        EM(NETFS_WRITETHROUGH,                  "WT")           \
        EM(NETFS_UNBUFFERED_WRITE,              "UW")           \
-       EM(NETFS_DIO_READ,                      "DR")           \
        E_(NETFS_DIO_WRITE,                     "DW")
 
 #define netfs_rreq_traces                                      \