summaryrefslogtreecommitdiffstats
path: root/fs/cachefiles/ondemand.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2024-01-29 08:59:23 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2024-01-29 08:59:23 +0100
commitc8282f7b8523a4d37e5fefa220d93f2be06650e2 (patch)
tree6ec17a2ea545b174dc903f6135f5b6258a1c4e2e /fs/cachefiles/ondemand.c
parent04447d48afd365a837e23cde631517f166045b9d (diff)
parent41bccc98fb7931d63d03f326a746ac4d429c1dd3 (diff)
downloadlinux-stable-c8282f7b8523a4d37e5fefa220d93f2be06650e2.tar.gz
linux-stable-c8282f7b8523a4d37e5fefa220d93f2be06650e2.tar.bz2
linux-stable-c8282f7b8523a4d37e5fefa220d93f2be06650e2.zip
Merge tag 'v6.8-rc2'
Linux 6.8-rc2 The vb2 fixes from v6.8-rc2 are needed for the work on the new vb2 delete buffers feature. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'fs/cachefiles/ondemand.c')
-rw-r--r--fs/cachefiles/ondemand.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
index 5fd74ec60bef..4ba42f1fa3b4 100644
--- a/fs/cachefiles/ondemand.c
+++ b/fs/cachefiles/ondemand.c
@@ -539,6 +539,9 @@ int cachefiles_ondemand_init_object(struct cachefiles_object *object)
struct fscache_volume *volume = object->volume->vcookie;
size_t volume_key_size, cookie_key_size, data_len;
+ if (!object->ondemand)
+ return 0;
+
/*
* CacheFiles will firstly check the cache file under the root cache
* directory. If the coherency check failed, it will fallback to