Skip to content

Commit 6238729

Browse files
torvaldstorvalds
committed
Merge tag 'fuse-update-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi: - Extend copy_file_range interface to be fully 64bit capable (Miklos) - Add selftest for fusectl (Chen Linxuan) - Move fuse docs into a separate directory (Bagas Sanjaya) - Allow fuse to enter freezable state in some cases (Sergey Senozhatsky) - Clean up writeback accounting after removing tmp page copies (Joanne) - Optimize virtiofs request handling (Li RongQing) - Add synchronous FUSE_INIT support (Miklos) - Allow server to request prune of unused inodes (Miklos) - Fix deadlock with AIO/sync release (Darrick) - Add some prep patches for block/iomap support (Darrick) - Misc fixes and cleanups * tag 'fuse-update-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (26 commits) fuse: move CREATE_TRACE_POINTS to a separate file fuse: move the backing file idr and code into a new source file fuse: enable FUSE_SYNCFS for all fuseblk servers fuse: capture the unique id of fuse commands being sent fuse: fix livelock in synchronous file put from fuseblk workers mm: fix lockdep issues in writeback handling fuse: add prune notification fuse: remove redundant calls to fuse_copy_finish() in fuse_notify() fuse: fix possibly missing fuse_copy_finish() call in fuse_notify() fuse: remove FUSE_NOTIFY_CODE_MAX from <uapi/linux/fuse.h> fuse: remove fuse_readpages_end() null mapping check fuse: fix references to fuse.rst -> fuse/fuse.rst fuse: allow synchronous FUSE_INIT fuse: zero initialize inode private data fuse: remove unused 'inode' parameter in fuse_passthrough_open virtio_fs: fix the hash table using in virtio_fs_enqueue_req() mm: remove BDI_CAP_WRITEBACK_ACCT fuse: use default writeback accounting virtio_fs: Remove redundant spinlock in virtio_fs_request_complete() fuse: remove unneeded offset assignment when filling write pages ...
2 parents cf06d79 + cb40359 commit 6238729

34 files changed

Lines changed: 922 additions & 398 deletions

File tree

Documentation/filesystems/fuse-io-uring.rst renamed to Documentation/filesystems/fuse/fuse-io-uring.rst

File renamed without changes.

Documentation/filesystems/fuse-io.rst renamed to Documentation/filesystems/fuse/fuse-io.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. SPDX-License-Identifier: GPL-2.0
22
33
==============
4-
Fuse I/O Modes
4+
FUSE I/O Modes
55
==============
66

77
Fuse supports the following I/O modes:

Documentation/filesystems/fuse-passthrough.rst renamed to Documentation/filesystems/fuse/fuse-passthrough.rst

File renamed without changes.

Documentation/filesystems/fuse.rst renamed to Documentation/filesystems/fuse/fuse.rst

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.. SPDX-License-Identifier: GPL-2.0
22
3-
====
4-
FUSE
5-
====
3+
=============
4+
FUSE Overview
5+
=============
66

77
Definitions
88
===========
@@ -129,6 +129,20 @@ For each connection the following files exist within this directory:
129129
connection. This means that all waiting requests will be aborted an
130130
error returned for all aborted and new requests.
131131

132+
max_background
133+
The maximum number of background requests that can be outstanding
134+
at a time. When the number of background requests reaches this limit,
135+
further requests will be blocked until some are completed, potentially
136+
causing I/O operations to stall.
137+
138+
congestion_threshold
139+
The threshold of background requests at which the kernel considers
140+
the filesystem to be congested. When the number of background requests
141+
exceeds this value, the kernel will skip asynchronous readahead
142+
operations, reducing read-ahead optimizations but preserving essential
143+
I/O, as well as suspending non-synchronous writeback operations
144+
(WB_SYNC_NONE), delaying page cache flushing to the filesystem.
145+
132146
Only the owner of the mount may read or write these files.
133147

134148
Interrupting filesystem operations

‎Documentation/filesystems/fuse/index.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
======================================================
4+
FUSE (Filesystem in Userspace) Technical Documentation
5+
======================================================
6+
7+
.. toctree::
8+
:maxdepth: 2
9+
:numbered:
10+
11+
fuse
12+
fuse-io
13+
fuse-io-uring
14+
fuse-passthrough

‎Documentation/filesystems/index.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ Documentation for filesystem implementations.
9595
hfs
9696
hfsplus
9797
hpfs
98-
fuse
99-
fuse-io
100-
fuse-io-uring
101-
fuse-passthrough
98+
fuse/index
10299
inotify
103100
isofs
104101
nilfs2

‎Documentation/filesystems/sysfs.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ span multiple bus types).
321321

322322
fs/ contains a directory for some filesystems. Currently each
323323
filesystem wanting to export attributes must create its own hierarchy
324-
below fs/ (see ./fuse.rst for an example).
324+
below fs/ (see fuse/fuse.rst for an example).
325325

326326
module/ contains parameter values and state information for all
327327
loaded system modules, for both builtin and loadable modules.

‎Documentation/translations/zh_CN/filesystems/sysfs.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ drivers/ 包含了每个已为特定总线上的设备而挂载的驱动程序
282282
假定驱动没有跨越多个总线类型)。
283283

284284
fs/ 包含了一个为文件系统设立的目录。现在每个想要导出属性的文件系统必须
285-
在 fs/ 下创建自己的层次结构(参见Documentation/filesystems/fuse.rst)。
285+
在 fs/ 下创建自己的层次结构(参见Documentation/filesystems/fuse/fuse.rst)。
286286

287287
dev/ 包含两个子目录： char/ 和 block/。在这两个子目录中，有以
288288
<major>:<minor> 格式命名的符号链接。这些符号链接指向 sysfs 目录

‎Documentation/translations/zh_TW/filesystems/sysfs.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ drivers/ 包含了每個已爲特定總線上的設備而掛載的驅動程序
285285
假定驅動沒有跨越多個總線類型)。
286286

287287
fs/ 包含了一個爲文件系統設立的目錄。現在每個想要導出屬性的文件系統必須
288-
在 fs/ 下創建自己的層次結構(參見Documentation/filesystems/fuse.rst)。
288+
在 fs/ 下創建自己的層次結構(參見Documentation/filesystems/fuse/fuse.rst)。
289289

290290
dev/ 包含兩個子目錄： char/ 和 block/。在這兩個子目錄中，有以
291291
<major>:<minor> 格式命名的符號鏈接。這些符號鏈接指向 sysfs 目錄

‎MAINTAINERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10208,9 +10208,10 @@ L: linux-fsdevel@vger.kernel.org
1020810208
S: Maintained
1020910209
W: https://github.com/libfuse/
1021010210
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
10211-
F: Documentation/filesystems/fuse*
10211+
F: Documentation/filesystems/fuse/*
1021210212
F: fs/fuse/
1021310213
F: include/uapi/linux/fuse.h
10214+
F: tools/testing/selftests/filesystems/fuse/
1021410215

1021510216
FUTEX SUBSYSTEM
1021610217
M: Thomas Gleixner <tglx@linutronix.de>

0 commit comments

Comments
 (0)