diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-18 09:50:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-18 09:50:23 -0800 |
| commit | 5fbad44dddf560ba03e247352e8040992c7e95e8 (patch) | |
| tree | 559e3406c40c05d748be84048d649cc05985a9d8 /Documentation | |
| parent | 84bd7e08a79a5d3153c3a5805a1347a8dc979f35 (diff) | |
| parent | e02ac3e7329f76c5de40cba2746cbe165f571dff (diff) | |
| download | linux-stable-5fbad44dddf560ba03e247352e8040992c7e95e8.tar.gz linux-stable-5fbad44dddf560ba03e247352e8040992c7e95e8.tar.bz2 linux-stable-5fbad44dddf560ba03e247352e8040992c7e95e8.zip | |
Merge tag 'erofs-for-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs
Pull erofs fixes from Gao Xiang:
"Two patches fixes issues reported by syzbot, one fixes a missing
`domain_id` mount option in documentation and a minor cleanup:
- Fix wrong iomap->length calculation post EOF, which could cause a
WARN_ON in iomap_iter_done() (Siddh)
- Fix improper kvcalloc() use with __GFP_NOFAIL (me)
- Add missing `domain_id` mount option in documentation (Jingbo)
- Clean up fscache option parsing (Jingbo)"
* tag 'erofs-for-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
erofs: clean up parsing of fscache related options
erofs: add documentation for 'domain_id' mount option
erofs: fix kvcalloc() misuse with __GFP_NOFAIL
erofs/zmap.c: Fix incorrect offset calculation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/erofs.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/filesystems/erofs.rst b/Documentation/filesystems/erofs.rst index 067fd1670b1f..a43aacf1494e 100644 --- a/Documentation/filesystems/erofs.rst +++ b/Documentation/filesystems/erofs.rst @@ -120,6 +120,8 @@ dax={always,never} Use direct access (no page cache). See dax A legacy option which is an alias for ``dax=always``. device=%s Specify a path to an extra device to be used together. fsid=%s Specify a filesystem image ID for Fscache back-end. +domain_id=%s Specify a domain ID in fscache mode so that different images + with the same blobs under a given domain ID can share storage. =================== ========================================================= Sysfs Entries |