diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-18 10:26:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-18 10:26:49 -0800 |
| commit | 8dcf44fcad5ef5c1ff915628255c19cbe91f2588 (patch) | |
| tree | eb7847bf38f1109bcd22c02aad57f6162277650b /include/trace | |
| parent | 56be9aaf98d58bf69e2c948c183001d77e63fbbb (diff) | |
| parent | a4b2923376be062a243ac38762212a38485cfab1 (diff) | |
| download | linux-8dcf44fcad5ef5c1ff915628255c19cbe91f2588.tar.gz linux-8dcf44fcad5ef5c1ff915628255c19cbe91f2588.tar.bz2 linux-8dcf44fcad5ef5c1ff915628255c19cbe91f2588.zip | |
Merge tag 'vfs-6.13.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull netfs updates from Christian Brauner:
"Various fixes for the netfs library and related infrastructure:
cachefiles:
- Fix a dentry leak in cachefiles_open_file()
- Fix incorrect length return value in
cachefiles_ondemand_fd_write_iter()
- Fix missing pos updates in cachefiles_ondemand_fd_write_iter()
- Clean up in cachefiles_commit_tmpfile()
- Fix NULL pointer dereference in object->file
- Add a memory barrier for FSCACHE_VOLUME_CREATING
netfs:
- Remove call to folio_index()
- Fix a few minor bugs in netfs_page_mkwrite()
- Remove unnecessary references to pages"
* tag 'vfs-6.13.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
netfs/fscache: Add a memory barrier for FSCACHE_VOLUME_CREATING
cachefiles: Fix NULL pointer dereference in object->file
cachefiles: Clean up in cachefiles_commit_tmpfile()
cachefiles: Fix missing pos updates in cachefiles_ondemand_fd_write_iter()
cachefiles: Fix incorrect length return value in cachefiles_ondemand_fd_write_iter()
netfs: Remove unnecessary references to pages
netfs: Fix a few minor bugs in netfs_page_mkwrite()
netfs: Remove call to folio_index()
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/netfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index 69975c9c6823..bf511bca896e 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -450,7 +450,7 @@ TRACE_EVENT(netfs_folio, struct address_space *__m = READ_ONCE(folio->mapping); __entry->ino = __m ? __m->host->i_ino : 0; __entry->why = why; - __entry->index = folio_index(folio); + __entry->index = folio->index; __entry->nr = folio_nr_pages(folio); ), |