Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (ddb36077) · Commits · 戴 / test

fs/configfs/inode.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -292,7 +292,7 @@ int __init configfs_inode_init(void)
	return bdi_init(&configfs_backing_dev_info);		return bdi_init(&configfs_backing_dev_info);
	}		}

	void __exit configfs_inode_exit(void)		void configfs_inode_exit(void)
	{		{
	bdi_destroy(&configfs_backing_dev_info);		bdi_destroy(&configfs_backing_dev_info);
	}		}

+17 −19

Original line number	Original line	Diff line number	Diff line
	@@ -143,28 +143,26 @@ static int __init configfs_init(void)
	goto out;		goto out;

	config_kobj = kobject_create_and_add("config", kernel_kobj);		config_kobj = kobject_create_and_add("config", kernel_kobj);
	if (!config_kobj) {		if (!config_kobj)
	kmem_cache_destroy(configfs_dir_cachep);		goto out2;
	configfs_dir_cachep = NULL;
	goto out;		err = configfs_inode_init();
	}		if (err)
			goto out3;

	err = register_filesystem(&configfs_fs_type);		err = register_filesystem(&configfs_fs_type);
	if (err) {		if (err)
	printk(KERN_ERR "configfs: Unable to register filesystem!\n");		goto out4;
	kobject_put(config_kobj);
	kmem_cache_destroy(configfs_dir_cachep);
	configfs_dir_cachep = NULL;
	goto out;
	}

	err = configfs_inode_init();		return 0;
	if (err) {		out4:
	unregister_filesystem(&configfs_fs_type);		printk(KERN_ERR "configfs: Unable to register filesystem!\n");
			configfs_inode_exit();
			out3:
	kobject_put(config_kobj);		kobject_put(config_kobj);
			out2:
	kmem_cache_destroy(configfs_dir_cachep);		kmem_cache_destroy(configfs_dir_cachep);
	configfs_dir_cachep = NULL;		configfs_dir_cachep = NULL;
	}
	out:		out:
	return err;		return err;
	}		}

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1138,28 +1138,28 @@ static int __init fuse_fs_init(void)
	{		{
	int err;		int err;

	err = register_filesystem(&fuse_fs_type);
	if (err)
	goto out;

	err = register_fuseblk();
	if (err)
	goto out_unreg;

	fuse_inode_cachep = kmem_cache_create("fuse_inode",		fuse_inode_cachep = kmem_cache_create("fuse_inode",
	sizeof(struct fuse_inode),		sizeof(struct fuse_inode),
	0, SLAB_HWCACHE_ALIGN,		0, SLAB_HWCACHE_ALIGN,
	fuse_inode_init_once);		fuse_inode_init_once);
	err = -ENOMEM;		err = -ENOMEM;
	if (!fuse_inode_cachep)		if (!fuse_inode_cachep)
	goto out_unreg2;		goto out;

			err = register_fuseblk();
			if (err)
			goto out2;

			err = register_filesystem(&fuse_fs_type);
			if (err)
			goto out3;

	return 0;		return 0;

	out_unreg2:		out3:
	unregister_fuseblk();		unregister_fuseblk();
	out_unreg:		out2:
	unregister_filesystem(&fuse_fs_type);		kmem_cache_destroy(fuse_inode_cachep);
	out:		out:
	return err;		return err;
	}		}

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -548,7 +548,7 @@ static int ncp_fill_super(struct super_block sb, void raw_data, int silent)

	error = bdi_setup_and_register(&server->bdi, "ncpfs", BDI_CAP_MAP_COPY);		error = bdi_setup_and_register(&server->bdi, "ncpfs", BDI_CAP_MAP_COPY);
	if (error)		if (error)
	goto out_bdi;		goto out_fput;

	server->ncp_filp = ncp_filp;		server->ncp_filp = ncp_filp;
	server->ncp_sock = sock;		server->ncp_sock = sock;
	@@ -559,7 +559,7 @@ static int ncp_fill_super(struct super_block sb, void raw_data, int silent)
	error = -EBADF;		error = -EBADF;
	server->info_filp = fget(data.info_fd);		server->info_filp = fget(data.info_fd);
	if (!server->info_filp)		if (!server->info_filp)
	goto out_fput;		goto out_bdi;
	error = -ENOTSOCK;		error = -ENOTSOCK;
	sock_inode = server->info_filp->f_path.dentry->d_inode;		sock_inode = server->info_filp->f_path.dentry->d_inode;
	if (!S_ISSOCK(sock_inode->i_mode))		if (!S_ISSOCK(sock_inode->i_mode))
	@@ -746,9 +746,9 @@ out_nls:
	out_fput2:		out_fput2:
	if (server->info_filp)		if (server->info_filp)
	fput(server->info_filp);		fput(server->info_filp);
	out_fput:
	bdi_destroy(&server->bdi);
	out_bdi:		out_bdi:
			bdi_destroy(&server->bdi);
			out_fput:
	/* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>:		/* 23/12/1998 Marcin Dalecki <dalecki@cs.net.pl>:
	*		*
	* The previously used put_filp(ncp_filp); was bogus, since		* The previously used put_filp(ncp_filp); was bogus, since

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -91,20 +91,18 @@ static struct file_system_type proc_fs_type = {

	void __init proc_root_init(void)		void __init proc_root_init(void)
	{		{
	struct vfsmount *mnt;
	int err;		int err;

	proc_init_inodecache();		proc_init_inodecache();
	err = register_filesystem(&proc_fs_type);		err = register_filesystem(&proc_fs_type);
	if (err)		if (err)
	return;		return;
	mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);		err = pid_ns_prepare_proc(&init_pid_ns);
	if (IS_ERR(mnt)) {		if (err) {
	unregister_filesystem(&proc_fs_type);		unregister_filesystem(&proc_fs_type);
	return;		return;
	}		}

	init_pid_ns.proc_mnt = mnt;
	proc_symlink("mounts", NULL, "self/mounts");		proc_symlink("mounts", NULL, "self/mounts");

	proc_net_init();		proc_net_init();
	@@ -209,5 +207,5 @@ int pid_ns_prepare_proc(struct pid_namespace *ns)

	void pid_ns_release_proc(struct pid_namespace *ns)		void pid_ns_release_proc(struct pid_namespace *ns)
	{		{
	mntput(ns->proc_mnt);		kern_unmount(ns->proc_mnt);
	}		}