Commit 933a90bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents 5f4fc6d4 037f11b4

arch/ia64/kernel/perfmon.c

+10 −7
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/smp.h>

#include <linux/pagemap.h>

#include <linux/mount.h>

#include <linux/pseudo_fs.h>

#include <linux/bitops.h>

#include <linux/capability.h>

#include <linux/rcupdate.h>
@@ -600,16 +601,18 @@ pfm_unprotect_ctx_ctxsw(pfm_context_t *x, unsigned long f) 
/* forward declaration */

static const struct dentry_operations pfmfs_dentry_operations;



static struct dentry *

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

static int pfmfs_init_fs_context(struct fs_context *fc)

{

	return mount_pseudo(fs_type, "pfm:", NULL, &pfmfs_dentry_operations,

			PFMFS_MAGIC);

	struct pseudo_fs_context *ctx = init_pseudo(fc, PFMFS_MAGIC);

	if (!ctx)

		return -ENOMEM;

	ctx->dops = &pfmfs_dentry_operations;

	return 0;

}



static struct file_system_type pfm_fs_type = {

	.name			= "pfmfs",

	.mount    = pfmfs_mount,

	.init_fs_context	= pfmfs_init_fs_context,

	.kill_sb		= kill_anon_super,

};

MODULE_ALIAS_FS("pfmfs");

arch/x86/kernel/cpu/resctrl/rdtgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -2104,7 +2104,6 @@ static int rdt_init_fs_context(struct fs_context *fc) 
	ctx->kfc.magic = RDTGROUP_SUPER_MAGIC;

	fc->fs_private = &ctx->kfc;

	fc->ops = &rdt_fs_context_ops;

	if (fc->user_ns)

	put_user_ns(fc->user_ns);

	fc->user_ns = get_user_ns(&init_user_ns);

	fc->global = true;

drivers/base/devtmpfs.c

+1 −2
Original line number Diff line number Diff line
@@ -357,8 +357,7 @@ int devtmpfs_mount(const char *mntdir) 
	if (!thread)

		return 0;



	err = ksys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT,

			 NULL);

	err = ksys_mount("devtmpfs", mntdir, "devtmpfs", MS_SILENT, NULL);

	if (err)

		printk(KERN_INFO "devtmpfs: error mounting %i\n", err);

	else

drivers/dax/super.c

+10 −13
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/pagemap.h>

#include <linux/module.h>

#include <linux/mount.h>

#include <linux/pseudo_fs.h>

#include <linux/magic.h>

#include <linux/genhd.h>

#include <linux/pfn_t.h>
@@ -469,15 +470,18 @@ static const struct super_operations dax_sops = { 
	.drop_inode = generic_delete_inode,

};



static struct dentry *dax_mount(struct file_system_type *fs_type,

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

static int dax_init_fs_context(struct fs_context *fc)

{

	return mount_pseudo(fs_type, "dax:", &dax_sops, NULL, DAXFS_MAGIC);

	struct pseudo_fs_context *ctx = init_pseudo(fc, DAXFS_MAGIC);

	if (!ctx)

		return -ENOMEM;

	ctx->ops = &dax_sops;

	return 0;

}



static struct file_system_type dax_fs_type = {

	.name		= "dax",

	.mount = dax_mount,

	.init_fs_context = dax_init_fs_context,

	.kill_sb	= kill_anon_super,

};
@@ -665,10 +669,6 @@ static int dax_fs_init(void) 
	if (!dax_cache)

		return -ENOMEM;



	rc = register_filesystem(&dax_fs_type);

	if (rc)

		goto err_register_fs;



	dax_mnt = kern_mount(&dax_fs_type);

	if (IS_ERR(dax_mnt)) {

		rc = PTR_ERR(dax_mnt);
@@ -679,8 +679,6 @@ static int dax_fs_init(void) 
	return 0;



 err_mount:

	unregister_filesystem(&dax_fs_type);

 err_register_fs:

	kmem_cache_destroy(dax_cache);



	return rc;
@@ -689,7 +687,6 @@ static int dax_fs_init(void) 
static void dax_fs_exit(void)

{

	kern_unmount(dax_mnt);

	unregister_filesystem(&dax_fs_type);

	kmem_cache_destroy(dax_cache);

}

drivers/dma-buf/dma-buf.c

+10 −5
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/reservation.h>

#include <linux/mm.h>

#include <linux/mount.h>

#include <linux/pseudo_fs.h>



#include <uapi/linux/dma-buf.h>

#include <uapi/linux/magic.h>
@@ -59,16 +60,20 @@ static const struct dentry_operations dma_buf_dentry_ops = { 


static struct vfsmount *dma_buf_mnt;



static struct dentry *dma_buf_fs_mount(struct file_system_type *fs_type,

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

static int dma_buf_fs_init_context(struct fs_context *fc)

{

	return mount_pseudo(fs_type, "dmabuf:", NULL, &dma_buf_dentry_ops,

			DMA_BUF_MAGIC);

	struct pseudo_fs_context *ctx;



	ctx = init_pseudo(fc, DMA_BUF_MAGIC);

	if (!ctx)

		return -ENOMEM;

	ctx->dops = &dma_buf_dentry_ops;

	return 0;

}



static struct file_system_type dma_buf_fs_type = {

	.name = "dmabuf",

	.mount = dma_buf_fs_mount,

	.init_fs_context = dma_buf_fs_init_context,

	.kill_sb = kill_anon_super,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE