Skip to content

Commit c57de2a

Browse files
dhowellsbrauner
authored andcommitted
netfs: Remove NETFS_COPY_TO_CACHE
Remove NETFS_COPY_TO_CACHE as it isn't used anymore. Signed-off-by: David Howells <[email protected]> cc: Jeff Layton <[email protected]> cc: [email protected] cc: [email protected] Link: https://lore.kernel.org/r/[email protected]/ # v2 Signed-off-by: Christian Brauner <[email protected]>
1 parent 51e9a86 commit c57de2a

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

fs/netfs/main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ static const char *netfs_origins[nr__netfs_io_origin] = {
3737
[NETFS_READAHEAD] = "RA",
3838
[NETFS_READPAGE] = "RP",
3939
[NETFS_READ_FOR_WRITE] = "RW",
40-
[NETFS_COPY_TO_CACHE] = "CC",
40+
[NETFS_DIO_READ] = "DR",
4141
[NETFS_WRITEBACK] = "WB",
4242
[NETFS_WRITETHROUGH] = "WT",
4343
[NETFS_UNBUFFERED_WRITE] = "UW",
44-
[NETFS_DIO_READ] = "DR",
4544
[NETFS_DIO_WRITE] = "DW",
4645
};
4746

include/linux/netfs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,10 @@ enum netfs_io_origin {
207207
NETFS_READAHEAD, /* This read was triggered by readahead */
208208
NETFS_READPAGE, /* This read is a synchronous read */
209209
NETFS_READ_FOR_WRITE, /* This read is to prepare a write */
210-
NETFS_COPY_TO_CACHE, /* This write is to copy a read to the cache */
210+
NETFS_DIO_READ, /* This is a direct I/O read */
211211
NETFS_WRITEBACK, /* This write was triggered by writepages */
212212
NETFS_WRITETHROUGH, /* This write was made by netfs_perform_write() */
213213
NETFS_UNBUFFERED_WRITE, /* This is an unbuffered write */
214-
NETFS_DIO_READ, /* This is a direct I/O read */
215214
NETFS_DIO_WRITE, /* This is a direct I/O write */
216215
nr__netfs_io_origin
217216
} __mode(byte);

include/trace/events/netfs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434
EM(NETFS_READAHEAD, "RA") \
3535
EM(NETFS_READPAGE, "RP") \
3636
EM(NETFS_READ_FOR_WRITE, "RW") \
37-
EM(NETFS_COPY_TO_CACHE, "CC") \
37+
EM(NETFS_DIO_READ, "DR") \
3838
EM(NETFS_WRITEBACK, "WB") \
3939
EM(NETFS_WRITETHROUGH, "WT") \
4040
EM(NETFS_UNBUFFERED_WRITE, "UW") \
41-
EM(NETFS_DIO_READ, "DR") \
4241
E_(NETFS_DIO_WRITE, "DW")
4342

4443
#define netfs_rreq_traces \

0 commit comments

Comments
 (0)