diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 12:38:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-09 12:38:18 -0700 |
| commit | e2e694b9e6f3ec7deeb233b6b0fe20b6a47b304b (patch) | |
| tree | f98682de600e9b224f73412d855f5a40f635b5ca /include | |
| parent | 7b7699c09f66f180b9a8a5010df352acb8683bfa (diff) | |
| parent | 6e7c1770a212239e88ec01ddc7a741505bfd10e5 (diff) | |
Merge branch 'work.init' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull root filesystem type handling updates from Al Viro:
"Teach init/do_mounts.c to handle non-block filesystems, hopefully
preventing even more special-cased kludges (such as root=/dev/nfs,
etc)"
* 'work.init' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: simplify get_filesystem_list / get_all_fs_names
init: allow mounting arbitrary non-blockdevice filesystems as root
init: split get_fs_names
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 37ad9a730a89..29b355037c08 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3592,7 +3592,7 @@ int proc_nr_dentry(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos); int proc_nr_inodes(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos); -int __init get_filesystem_list(char *buf); +int __init list_bdev_fs_names(char *buf, size_t size); #define __FMODE_EXEC ((__force int) FMODE_EXEC) #define __FMODE_NONOTIFY ((__force int) FMODE_NONOTIFY) |