diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-15 10:27:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-15 10:27:28 -0700 |
| commit | 1ce9d792e8ef286ed03b151b9bdfcd921e04a988 (patch) | |
| tree | c54f990d7b34c0e99f979593ec912f9d0dcb8edc /include | |
| parent | Merge tag 'spi-fix-v5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | netfs: do not unlock and put the folio twice (diff) | |
| download | linux-dev-1ce9d792e8ef286ed03b151b9bdfcd921e04a988.tar.xz linux-dev-1ce9d792e8ef286ed03b151b9bdfcd921e04a988.zip | |
Merge tag 'ceph-for-5.19-rc7' of https://github.com/ceph/ceph-client
Pull ceph fix from Ilya Dryomov:
"A folio locking fixup that Xiubo and David cooperated on, marked for
stable. Most of it is in netfs but I picked it up into ceph tree on
agreement with David"
* tag 'ceph-for-5.19-rc7' of https://github.com/ceph/ceph-client:
netfs: do not unlock and put the folio twice
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 1773e5df8e65..1b18dfa52e48 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -214,7 +214,7 @@ struct netfs_request_ops { void (*issue_read)(struct netfs_io_subrequest *subreq); bool (*is_still_valid)(struct netfs_io_request *rreq); int (*check_write_begin)(struct file *file, loff_t pos, unsigned len, - struct folio *folio, void **_fsdata); + struct folio **foliop, void **_fsdata); void (*done)(struct netfs_io_request *rreq); }; |