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

Commit 48fde701 authored by Al Viro's avatar Al Viro
Browse files

switch open-coded instances of d_make_root() to new helper 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -757,9 +757,9 @@ spufs_create_root(struct super_block *sb, void *data) 
		goto out_iput;



	ret = -ENOMEM;

	sb->s_root = d_alloc_root(inode);

	sb->s_root = d_make_root(inode);

	if (!sb->s_root)

		goto out_iput;

		goto out;



	return 0;

out_iput:

arch/s390/hypfs/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -293,11 +293,9 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) 
		return -ENOMEM;

	root_inode->i_op = &simple_dir_inode_operations;

	root_inode->i_fop = &simple_dir_operations;

	sb->s_root = root_dentry = d_alloc_root(root_inode);

	if (!root_dentry) {

		iput(root_inode);

	sb->s_root = root_dentry = d_make_root(root_inode);

	if (!root_dentry)

		return -ENOMEM;

	}

	if (MACHINE_IS_VM)

		rc = hypfs_vm_create_files(sb, root_dentry);

	else

drivers/misc/ibmasm/ibmasmfs.c

+2 −4
Original line number Diff line number Diff line
@@ -129,11 +129,9 @@ static int ibmasmfs_fill_super (struct super_block *sb, void *data, int silent) 
	root->i_op = &simple_dir_inode_operations;

	root->i_fop = ibmasmfs_dir_ops;



	root_dentry = d_alloc_root(root);

	if (!root_dentry) {

		iput(root);

	root_dentry = d_make_root(root);

	if (!root_dentry)

		return -ENOMEM;

	}

	sb->s_root = root_dentry;



	ibmasmfs_create_files(sb, root_dentry);

drivers/oprofile/oprofilefs.c

+2 −4
Original line number Diff line number Diff line
@@ -251,11 +251,9 @@ static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent) 
		return -ENOMEM;

	root_inode->i_op = &simple_dir_inode_operations;

	root_inode->i_fop = &simple_dir_operations;

	root_dentry = d_alloc_root(root_inode);

	if (!root_dentry) {

		iput(root_inode);

	root_dentry = d_make_root(root_inode);

	if (!root_dentry)

		return -ENOMEM;

	}



	sb->s_root = root_dentry;

drivers/usb/core/inode.c

+1 −8
Original line number Diff line number Diff line
@@ -462,16 +462,9 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_op = &usbfs_ops;

	sb->s_time_gran = 1;

	inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);



	if (!inode) {

		dbg("%s: could not get inode!",__func__);

		return -ENOMEM;

	}



	root = d_alloc_root(inode);

	root = d_make_root(inode);

	if (!root) {

		dbg("%s: could not get root dentry!",__func__);

		iput(inode);

		return -ENOMEM;

	}

	sb->s_root = root;