diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-19 13:42:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-19 13:42:02 -0400 |
commit | 933a90bf4f3505f8ec83bda21a3c7d70d7c2b426 (patch) | |
tree | ca81c209000a15670e3582760ad9bae1a9cde215 /fs/ramfs/inode.c | |
parent | 5f4fc6d440d77a2cf74fe4ea56955674ac7e35e7 (diff) | |
parent | 037f11b4752f717201143a1dc5d6acf3cb71ddfa (diff) |
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs mount updates from Al Viro:
"The first part of mount updates.
Convert filesystems to use the new mount API"
* 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
mnt_init(): call shmem_init() unconditionally
constify ksys_mount() string arguments
don't bother with registering rootfs
init_rootfs(): don't bother with init_ramfs_fs()
vfs: Convert smackfs to use the new mount API
vfs: Convert selinuxfs to use the new mount API
vfs: Convert securityfs to use the new mount API
vfs: Convert apparmorfs to use the new mount API
vfs: Convert openpromfs to use the new mount API
vfs: Convert xenfs to use the new mount API
vfs: Convert gadgetfs to use the new mount API
vfs: Convert oprofilefs to use the new mount API
vfs: Convert ibmasmfs to use the new mount API
vfs: Convert qib_fs/ipathfs to use the new mount API
vfs: Convert efivarfs to use the new mount API
vfs: Convert configfs to use the new mount API
vfs: Convert binfmt_misc to use the new mount API
convenience helper: get_tree_single()
convenience helper get_tree_nodev()
vfs: Kill sget_userns()
...
Diffstat (limited to 'fs/ramfs/inode.c')
-rw-r--r-- | fs/ramfs/inode.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c index 11201b2d06b9..733c6b4193dc 100644 --- a/fs/ramfs/inode.c +++ b/fs/ramfs/inode.c | |||
@@ -266,12 +266,8 @@ static struct file_system_type ramfs_fs_type = { | |||
266 | .fs_flags = FS_USERNS_MOUNT, | 266 | .fs_flags = FS_USERNS_MOUNT, |
267 | }; | 267 | }; |
268 | 268 | ||
269 | int __init init_ramfs_fs(void) | 269 | static int __init init_ramfs_fs(void) |
270 | { | 270 | { |
271 | static unsigned long once; | ||
272 | |||
273 | if (test_and_set_bit(0, &once)) | ||
274 | return 0; | ||
275 | return register_filesystem(&ramfs_fs_type); | 271 | return register_filesystem(&ramfs_fs_type); |
276 | } | 272 | } |
277 | fs_initcall(init_ramfs_fs); | 273 | fs_initcall(init_ramfs_fs); |