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

Commit 53113b06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (29 commits)
  braino in internal.h
  convert simple cases of nfs-related ->get_sb() to ->mount()
  convert btrfs
  convert ceph
  convert gfs2
  convert afs
  convert ecryptfs
  convert sysfs
  convert cgroup and cpuset
  switch get_sb_ns() users
  switch procfs to ->mount()
  setting ->proc_mnt doesn't belong in proc_get_sb()
  convert cifs
  convert nilfs
  switch logfs to ->mount()
  logfs: fix a leak in get_sb
  logfs get_sb, part 3
  logfs get_sb, part 2
  logfs get_sb massage, part 1
  convert v9fs
  ...
parents 37542b6a a4cdbd8b

arch/ia64/kernel/perfmon.c

+4 −5
Original line number Diff line number Diff line
@@ -618,16 +618,15 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, 
}





static int

pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data,

	     struct vfsmount *mnt)

static struct dentry *

pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data)

{

	return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC, mnt);

	return mount_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC);

}



static struct file_system_type pfm_fs_type = {

	.name     = "pfmfs",

	.get_sb   = pfmfs_get_sb,

	.mount    = pfmfs_mount,

	.kill_sb  = kill_anon_super,

};

arch/powerpc/platforms/cell/spufs/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -798,17 +798,17 @@ spufs_fill_super(struct super_block *sb, void *data, int silent) 
	return spufs_create_root(sb, data);

}



static int

spufs_get_sb(struct file_system_type *fstype, int flags,

		const char *name, void *data, struct vfsmount *mnt)

static struct dentry *

spufs_mount(struct file_system_type *fstype, int flags,

		const char *name, void *data)

{

	return get_sb_single(fstype, flags, data, spufs_fill_super, mnt);

	return mount_single(fstype, flags, data, spufs_fill_super);

}



static struct file_system_type spufs_type = {

	.owner = THIS_MODULE,

	.name = "spufs",

	.get_sb = spufs_get_sb,

	.mount = spufs_mount,

	.kill_sb = kill_litter_super,

};

arch/s390/hypfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -316,10 +316,10 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) 
	return 0;

}



static int hypfs_get_super(struct file_system_type *fst, int flags,

			const char *devname, void *data, struct vfsmount *mnt)

static struct dentry *hypfs_mount(struct file_system_type *fst, int flags,

			const char *devname, void *data)

{

	return get_sb_single(fst, flags, data, hypfs_fill_super, mnt);

	return mount_single(fst, flags, data, hypfs_fill_super);

}



static void hypfs_kill_super(struct super_block *sb)
@@ -455,7 +455,7 @@ static const struct file_operations hypfs_file_ops = { 
static struct file_system_type hypfs_type = {

	.owner		= THIS_MODULE,

	.name		= "s390_hypfs",

	.get_sb		= hypfs_get_super,

	.mount		= hypfs_mount,

	.kill_sb	= hypfs_kill_super

};

drivers/base/devtmpfs.c

+9 −9
Original line number Diff line number Diff line
@@ -29,33 +29,33 @@ 
static struct vfsmount *dev_mnt;



#if defined CONFIG_DEVTMPFS_MOUNT

static int dev_mount = 1;

static int mount_dev = 1;

#else

static int dev_mount;

static int mount_dev;

#endif



static DEFINE_MUTEX(dirlock);



static int __init mount_param(char *str)

{

	dev_mount = simple_strtoul(str, NULL, 0);

	mount_dev = simple_strtoul(str, NULL, 0);

	return 1;

}

__setup("devtmpfs.mount=", mount_param);



static int dev_get_sb(struct file_system_type *fs_type, int flags,

		      const char *dev_name, void *data, struct vfsmount *mnt)

static struct dentry *dev_mount(struct file_system_type *fs_type, int flags,

		      const char *dev_name, void *data)

{

#ifdef CONFIG_TMPFS

	return get_sb_single(fs_type, flags, data, shmem_fill_super, mnt);

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

#else

	return get_sb_single(fs_type, flags, data, ramfs_fill_super, mnt);

	return mount_single(fs_type, flags, data, ramfs_fill_super);

#endif

}



static struct file_system_type dev_fs_type = {

	.name = "devtmpfs",

	.get_sb = dev_get_sb,

	.mount = dev_mount,

	.kill_sb = kill_litter_super,

};
@@ -351,7 +351,7 @@ int devtmpfs_mount(const char *mntdir) 
{

	int err;



	if (!dev_mount)

	if (!mount_dev)

		return 0;



	if (!dev_mnt)

drivers/infiniband/hw/ipath/ipath_fs.c

+7 −7
Original line number Diff line number Diff line
@@ -362,13 +362,13 @@ static int ipathfs_fill_super(struct super_block *sb, void *data, 
	return ret;

}



static int ipathfs_get_sb(struct file_system_type *fs_type, int flags,

			const char *dev_name, void *data, struct vfsmount *mnt)

static struct dentry *ipathfs_mount(struct file_system_type *fs_type,

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

{

	int ret = get_sb_single(fs_type, flags, data,

				    ipathfs_fill_super, mnt);

	if (ret >= 0)

		ipath_super = mnt->mnt_sb;

	struct dentry *ret;

	ret = mount_single(fs_type, flags, data, ipathfs_fill_super);

	if (!IS_ERR(ret))

		ipath_super = ret->d_sb;

	return ret;

}
@@ -411,7 +411,7 @@ int ipathfs_remove_device(struct ipath_devdata *dd) 
static struct file_system_type ipathfs_fs_type = {

	.owner =	THIS_MODULE,

	.name =		"ipathfs",

	.get_sb =	ipathfs_get_sb,

	.mount =	ipathfs_mount,

	.kill_sb =	ipathfs_kill_super,

};