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

Commit a1d4aebb authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

iget: stop PROCFS from using iget() and read_inode() 



Stop the PROCFS filesystem from using iget() and read_inode().  Merge
procfs_read_inode() into procfs_get_inode(), and have that call iget_locked()
instead of iget().

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a90a0880

fs/proc/inode.c

+28 −32
Original line number Diff line number Diff line
@@ -73,11 +73,6 @@ static void proc_delete_inode(struct inode *inode) 


struct vfsmount *proc_mnt;



static void proc_read_inode(struct inode * inode)

{

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;

}



static struct kmem_cache * proc_inode_cachep;



static struct inode *proc_alloc_inode(struct super_block *sb)
@@ -128,7 +123,6 @@ static int proc_remount(struct super_block *sb, int *flags, char *data) 
static const struct super_operations proc_sops = {

	.alloc_inode	= proc_alloc_inode,

	.destroy_inode	= proc_destroy_inode,

	.read_inode	= proc_read_inode,

	.drop_inode	= generic_delete_inode,

	.delete_inode	= proc_delete_inode,

	.statfs		= simple_statfs,
@@ -401,10 +395,11 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino, 
	if (de != NULL && !try_module_get(de->owner))

		goto out_mod;



	inode = iget(sb, ino);

	inode = iget_locked(sb, ino);

	if (!inode)

		goto out_ino;



	if (inode->i_state & I_NEW) {

		inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;

		PROC_I(inode)->fd = 0;

		PROC_I(inode)->pde = de;

		if (de) {
@@ -428,12 +423,13 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino, 
					else

#endif

						inode->i_fop = &proc_reg_file_ops;

			}

			else

				} else {

					inode->i_fop = de->proc_fops;

				}

			}



		}

		unlock_new_inode(inode);

	}

	return inode;



out_ino: