diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-17 00:43:16 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-08-17 00:43:16 +0200 |
| commit | 3bce87eb744f1f88523a118e10e0deebf31806ec (patch) | |
| tree | 02f9090ff510c97ce442a07b807615ad00f1406b /fs/nfs/fscache.c | |
| parent | perf stat: Display iostat headers correctly (diff) | |
| parent | Merge tag 'block-6.11-20240824' of git://git.kernel.dk/linux (diff) | |
| download | linux-3bce87eb744f1f88523a118e10e0deebf31806ec.tar.xz linux-3bce87eb744f1f88523a118e10e0deebf31806ec.zip | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up the latest perf-tools merge for 6.11, i.e. to have the
current perf tools branch that is getting into 6.11 with the
perf-tools-next that is geared towards 6.12.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'fs/nfs/fscache.c')
| -rw-r--r-- | fs/nfs/fscache.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c index 7202ce84d0eb..7a558dea75c4 100644 --- a/fs/nfs/fscache.c +++ b/fs/nfs/fscache.c @@ -265,6 +265,8 @@ static int nfs_netfs_init_request(struct netfs_io_request *rreq, struct file *fi { rreq->netfs_priv = get_nfs_open_context(nfs_file_open_context(file)); rreq->debug_id = atomic_inc_return(&nfs_netfs_debug_id); + /* [DEPRECATED] Use PG_private_2 to mark folio being written to the cache. */ + __set_bit(NETFS_RREQ_USE_PGPRIV2, &rreq->flags); return 0; } @@ -361,7 +363,8 @@ void nfs_netfs_read_completion(struct nfs_pgio_header *hdr) return; sreq = netfs->sreq; - if (test_bit(NFS_IOHDR_EOF, &hdr->flags)) + if (test_bit(NFS_IOHDR_EOF, &hdr->flags) && + sreq->rreq->origin != NETFS_DIO_READ) __set_bit(NETFS_SREQ_CLEAR_TAIL, &sreq->flags); if (hdr->error) |