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

Commit c74a1cbb authored by Al Viro's avatar Al Viro
Browse files

pass default dentry_operations to mount_pseudo() 



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

arch/ia64/kernel/perfmon.c

+4 −2
Original line number Diff line number Diff line
@@ -617,11 +617,14 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, 
	return get_unmapped_area(file, addr, len, pgoff, flags);

}



/* forward declaration */

static 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)

{

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

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

			PFMFS_MAGIC);

}



static struct file_system_type pfm_fs_type = {
@@ -2232,7 +2235,6 @@ pfm_alloc_file(pfm_context_t *ctx) 
	}

	path.mnt = mntget(pfmfs_mnt);



	d_set_d_op(path.dentry, &pfmfs_dentry_operations);

	d_add(path.dentry, inode);



	file = alloc_file(&path, FMODE_READ, &pfm_file_ops);

drivers/mtd/mtdchar.c

+1 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ static const struct file_operations mtd_fops = { 
static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type,

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

{

	return mount_pseudo(fs_type, "mtd_inode:", NULL, MTD_INODE_FS_MAGIC);

	return mount_pseudo(fs_type, "mtd_inode:", NULL, NULL, MTD_INODE_FS_MAGIC);

}



static struct file_system_type mtd_inodefs_type = {

fs/anon_inodes.c

+11 −10
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ static struct vfsmount *anon_inode_mnt __read_mostly; 
static struct inode *anon_inode_inode;

static const struct file_operations anon_inode_fops;



static struct dentry *anon_inodefs_mount(struct file_system_type *fs_type,

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

{

	return mount_pseudo(fs_type, "anon_inode:", NULL, ANON_INODE_FS_MAGIC);

}



/*

 * anon_inodefs_dname() is called from d_path().

 */
@@ -41,14 +35,22 @@ static char *anon_inodefs_dname(struct dentry *dentry, char *buffer, int buflen) 
				dentry->d_name.name);

}



static const struct dentry_operations anon_inodefs_dentry_operations = {

	.d_dname	= anon_inodefs_dname,

};



static struct dentry *anon_inodefs_mount(struct file_system_type *fs_type,

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

{

	return mount_pseudo(fs_type, "anon_inode:", NULL,

			&anon_inodefs_dentry_operations, ANON_INODE_FS_MAGIC);

}



static struct file_system_type anon_inode_fs_type = {

	.name		= "anon_inodefs",

	.mount		= anon_inodefs_mount,

	.kill_sb	= kill_anon_super,

};

static const struct dentry_operations anon_inodefs_dentry_operations = {

	.d_dname	= anon_inodefs_dname,

};



/*

 * nop .set_page_dirty method so that people can use .page_mkwrite on
@@ -113,7 +115,6 @@ struct file *anon_inode_getfile(const char *name, 
	 */

	ihold(anon_inode_inode);



	d_set_d_op(path.dentry, &anon_inodefs_dentry_operations);

	d_instantiate(path.dentry, anon_inode_inode);



	error = -ENFILE;

fs/block_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static const struct super_operations bdev_sops = { 
static struct dentry *bd_mount(struct file_system_type *fs_type,

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

{

	return mount_pseudo(fs_type, "bdev:", &bdev_sops, 0x62646576);

	return mount_pseudo(fs_type, "bdev:", &bdev_sops, NULL, 0x62646576);

}



static struct file_system_type bd_type = {

fs/libfs.c

+3 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static const struct super_operations simple_super_operations = { 
 * will never be mountable)

 */

struct dentry *mount_pseudo(struct file_system_type *fs_type, char *name,

	const struct super_operations *ops, unsigned long magic)

	const struct super_operations *ops,

	const struct dentry_operations *dops, unsigned long magic)

{

	struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);

	struct dentry *dentry;
@@ -254,6 +255,7 @@ struct dentry *mount_pseudo(struct file_system_type *fs_type, char *name, 
	dentry->d_parent = dentry;

	d_instantiate(dentry, root);

	s->s_root = dentry;

	s->s_d_op = dops;

	s->s_flags |= MS_ACTIVE;

	return dget(s->s_root);