Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e30d2a5 authored by Al Viro's avatar Al Viro
Browse files

make shmem_fill_super() static 



... have callers use shmem_mount()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent df024502

drivers/base/devtmpfs.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static struct dentry *dev_mount(struct file_system_type *fs_type, int flags, 
		      const char *dev_name, void *data)

{

#ifdef CONFIG_TMPFS

	return mount_nodev(fs_type, flags, data, shmem_fill_super);

	return shmem_mount(fs_type, flags, dev_name, data);

#else

	return ramfs_mount(fs_type, flags, dev_name, data);

#endif

include/linux/shmem_fs.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode) 
 * Functions in mm/shmem.c called directly from elsewhere:

 */

extern int shmem_init(void);

extern int shmem_fill_super(struct super_block *sb, void *data, int silent);

extern struct dentry *shmem_mount(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data);

extern struct file *shmem_file_setup(const char *name,

					loff_t size, unsigned long flags);

extern struct file *shmem_kernel_file_setup(const char *name, loff_t size,

init/do_mounts.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static struct dentry *rootfs_mount(struct file_system_type *fs_type, 
	int flags, const char *dev_name, void *data)

{

	if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)

		return mount_nodev(fs_type, flags, data, shmem_fill_super);

		return shmem_mount(fs_type, flags, dev_name, data);



	return ramfs_mount(fs_type, flags, dev_name, data);

}

mm/shmem.c

+2 −2
Original line number Diff line number Diff line
@@ -3547,7 +3547,7 @@ static void shmem_put_super(struct super_block *sb) 
	sb->s_fs_info = NULL;

}



int shmem_fill_super(struct super_block *sb, void *data, int silent)

static int shmem_fill_super(struct super_block *sb, void *data, int silent)

{

	struct inode *inode;

	struct shmem_sb_info *sbinfo;
@@ -3759,7 +3759,7 @@ static const struct vm_operations_struct shmem_vm_ops = { 
#endif

};



static struct dentry *shmem_mount(struct file_system_type *fs_type,

struct dentry *shmem_mount(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data)

{

	return mount_nodev(fs_type, flags, data, shmem_fill_super);