diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-15 18:57:32 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-15 18:57:37 +0300 |
| commit | 471864ac8a3274106e0bf3a3e2119c282b76c062 (patch) | |
| tree | 70a78630af16e5374ddfe9f5626750bf8bf60a7f /fs/cachefiles/ondemand.c | |
| parent | 8e8bc5000328a1ba8f93d43faf427e8ac31fb416 (diff) | |
| parent | 41c25e193b2befc22462aa41591d397fab174ca1 (diff) | |
| download | linux-471864ac8a3274106e0bf3a3e2119c282b76c062.tar.xz | |
Merge branch 'for-linus' into for-next
Pull the latest 6.8 stuff into devel branch for further development.
Fixed the trivial merge conflict for HD-audio Realtek stuff.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'fs/cachefiles/ondemand.c')
| -rw-r--r-- | fs/cachefiles/ondemand.c | 3 |
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 |