Commit 152a0836 authored by Al Viro's avatar Al Viro
Browse files

new helper: mount_bdev()



... and switch of the obvious get_sb_bdev() users to ->mount()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c96e41e9
Loading
Loading
Loading
Loading
+4 −5
Original line number Original line Diff line number Diff line
@@ -490,17 +490,16 @@ error:
	return -EINVAL;
	return -EINVAL;
}
}


static int adfs_get_sb(struct file_system_type *fs_type,
static struct dentry *adfs_mount(struct file_system_type *fs_type,
	int flags, const char *dev_name, void *data, struct vfsmount *mnt)
	int flags, const char *dev_name, void *data)
{
{
	return get_sb_bdev(fs_type, flags, dev_name, data, adfs_fill_super,
	return mount_bdev(fs_type, flags, dev_name, data, adfs_fill_super);
			   mnt);
}
}


static struct file_system_type adfs_fs_type = {
static struct file_system_type adfs_fs_type = {
	.owner		= THIS_MODULE,
	.owner		= THIS_MODULE,
	.name		= "adfs",
	.name		= "adfs",
	.get_sb		= adfs_get_sb,
	.mount		= adfs_mount,
	.kill_sb	= kill_block_super,
	.kill_sb	= kill_block_super,
	.fs_flags	= FS_REQUIRES_DEV,
	.fs_flags	= FS_REQUIRES_DEV,
};
};
+4 −5
Original line number Original line Diff line number Diff line
@@ -573,17 +573,16 @@ affs_statfs(struct dentry *dentry, struct kstatfs *buf)
	return 0;
	return 0;
}
}


static int affs_get_sb(struct file_system_type *fs_type,
static struct dentry *affs_mount(struct file_system_type *fs_type,
	int flags, const char *dev_name, void *data, struct vfsmount *mnt)
	int flags, const char *dev_name, void *data)
{
{
	return get_sb_bdev(fs_type, flags, dev_name, data, affs_fill_super,
	return mount_bdev(fs_type, flags, dev_name, data, affs_fill_super);
			   mnt);
}
}


static struct file_system_type affs_fs_type = {
static struct file_system_type affs_fs_type = {
	.owner		= THIS_MODULE,
	.owner		= THIS_MODULE,
	.name		= "affs",
	.name		= "affs",
	.get_sb		= affs_get_sb,
	.mount		= affs_mount,
	.kill_sb	= kill_block_super,
	.kill_sb	= kill_block_super,
	.fs_flags	= FS_REQUIRES_DEV,
	.fs_flags	= FS_REQUIRES_DEV,
};
};
+5 −6
Original line number Original line Diff line number Diff line
@@ -913,18 +913,17 @@ befs_statfs(struct dentry *dentry, struct kstatfs *buf)
	return 0;
	return 0;
}
}


static int
static struct dentry *
befs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name,
befs_mount(struct file_system_type *fs_type, int flags, const char *dev_name,
	    void *data, struct vfsmount *mnt)
	    void *data)
{
{
	return get_sb_bdev(fs_type, flags, dev_name, data, befs_fill_super,
	return mount_bdev(fs_type, flags, dev_name, data, befs_fill_super);
			   mnt);
}
}


static struct file_system_type befs_fs_type = {
static struct file_system_type befs_fs_type = {
	.owner		= THIS_MODULE,
	.owner		= THIS_MODULE,
	.name		= "befs",
	.name		= "befs",
	.get_sb		= befs_get_sb,
	.mount		= befs_mount,
	.kill_sb	= kill_block_super,
	.kill_sb	= kill_block_super,
	.fs_flags	= FS_REQUIRES_DEV,	
	.fs_flags	= FS_REQUIRES_DEV,	
};
};
+4 −4
Original line number Original line Diff line number Diff line
@@ -450,16 +450,16 @@ out:
	return ret;
	return ret;
}
}


static int bfs_get_sb(struct file_system_type *fs_type,
static struct dentry *bfs_mount(struct file_system_type *fs_type,
	int flags, const char *dev_name, void *data, struct vfsmount *mnt)
	int flags, const char *dev_name, void *data)
{
{
	return get_sb_bdev(fs_type, flags, dev_name, data, bfs_fill_super, mnt);
	return mount_bdev(fs_type, flags, dev_name, data, bfs_fill_super);
}
}


static struct file_system_type bfs_fs_type = {
static struct file_system_type bfs_fs_type = {
	.owner		= THIS_MODULE,
	.owner		= THIS_MODULE,
	.name		= "bfs",
	.name		= "bfs",
	.get_sb		= bfs_get_sb,
	.mount		= bfs_mount,
	.kill_sb	= kill_block_super,
	.kill_sb	= kill_block_super,
	.fs_flags	= FS_REQUIRES_DEV,
	.fs_flags	= FS_REQUIRES_DEV,
};
};
+4 −5
Original line number Original line Diff line number Diff line
@@ -533,17 +533,16 @@ static const struct super_operations cramfs_ops = {
	.statfs		= cramfs_statfs,
	.statfs		= cramfs_statfs,
};
};


static int cramfs_get_sb(struct file_system_type *fs_type,
static struct dentry *cramfs_mount(struct file_system_type *fs_type,
	int flags, const char *dev_name, void *data, struct vfsmount *mnt)
	int flags, const char *dev_name, void *data)
{
{
	return get_sb_bdev(fs_type, flags, dev_name, data, cramfs_fill_super,
	return mount_bdev(fs_type, flags, dev_name, data, cramfs_fill_super);
			   mnt);
}
}


static struct file_system_type cramfs_fs_type = {
static struct file_system_type cramfs_fs_type = {
	.owner		= THIS_MODULE,
	.owner		= THIS_MODULE,
	.name		= "cramfs",
	.name		= "cramfs",
	.get_sb		= cramfs_get_sb,
	.mount		= cramfs_mount,
	.kill_sb	= kill_block_super,
	.kill_sb	= kill_block_super,
	.fs_flags	= FS_REQUIRES_DEV,
	.fs_flags	= FS_REQUIRES_DEV,
};
};
Loading