Skip to contentSkip to conversation

fscache: Miscellaneous fixes

GIT PULL Merged David Howells 2 participants 2 messages Jul 8, 2022 VFS

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Could you pull these fscache/cachefiles fixes please?

(1) Fix a check in fscache_wait_on_volume_collision() in which the polarity is reversed. It should complain if a volume is still marked acquisition-pending after 20s, but instead complains if the mark has been cleared (ie. the condition has cleared).

Also switch an open-coded test of the ACQUIRE_PENDING volume flag to use the helper function for consistency.

(2) Not a fix per se, but neaten the code by using a helper to check for the DROPPED state.

(3) Fix cachefiles's support for erofs to only flush requests associated with a released control file, not all requests.

(4) Fix a race between one process invalidating an object in the cache and another process trying to look it up.

Thanks,
David
---
The following changes since commit 03c765b0e3b4cb5063276b086c76f7a612856a9a:

Linux 5.19-rc4 (2022-06-26 14:22:10 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/fscache-fixes-20220708

for you to fetch changes up to 85e4ea1049c70fb99de5c6057e835d151fb647da:

fscache: Fix invalidation/lookup race (2022-07-05 16:12:55 +0100)

----------------------------------------------------------------
fscache fixes

----------------------------------------------------------------
David Howells (1):
fscache: Fix invalidation/lookup race

Jia Zhu (1):
cachefiles: narrow the scope of flushed requests when releasing fd

Yue Hu (2):
fscache: Fix if condition in fscache_wait_on_volume_collision()
fscache: Introduce fscache_cookie_is_dropped()

 fs/cachefiles/ondemand.c |  3 ++-
 fs/fscache/cookie.c      | 26 ++++++++++++++++++++++----
 fs/fscache/volume.c      |  4 ++--
 include/linux/fscache.h  |  1 +
 4 files changed, 27 insertions(+), 7 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 08 Jul 2022 22:32:31 +0100:

The pull request you sent on Fri, 08 Jul 2022 22:32:31 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/fscache-fixes-20220708

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e5524c2a1fc4002a52e16236659e779767617a4f

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html