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

Commit aed7a6c4 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] proc: Replace proc_inode.type with proc_inode.fd 



The sole renaming use of proc_inode.type is to discover the file descriptor
number, so just store the file descriptor number and don't wory about
processing this field.  This removes any /proc limits on the maximum number of
file descriptors, and clears the path to make the hard coded /proc inode
numbers go away.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87bfbf67

fs/proc/base.c

+3 −3
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int proc_fd_link(struct inode *inode, struct dentry **dentry, struct vfsm 
	struct task_struct *task = proc_task(inode);

	struct files_struct *files;

	struct file *file;

	int fd = proc_type(inode) - PROC_TID_FD_DIR;

	int fd = proc_fd(inode);



	files = get_files_struct(task);

	if (files) {
@@ -1368,7 +1368,6 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st 
	 */

	get_task_struct(task);

	ei->task = task;

	ei->type = ino;

	inode->i_uid = 0;

	inode->i_gid = 0;

	if (task_dumpable(task)) {
@@ -1418,7 +1417,7 @@ static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd) 
{

	struct inode *inode = dentry->d_inode;

	struct task_struct *task = proc_task(inode);

	int fd = proc_type(inode) - PROC_TID_FD_DIR;

	int fd = proc_fd(inode);

	struct files_struct *files;



	files = get_files_struct(task);
@@ -1525,6 +1524,7 @@ static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry, 
	if (!inode)

		goto out;

	ei = PROC_I(inode);

	ei->fd = fd;

	files = get_files_struct(task);

	if (!files)

		goto out_unlock;

fs/proc/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct inode *proc_alloc_inode(struct super_block *sb) 
	if (!ei)

		return NULL;

	ei->task = NULL;

	ei->type = 0;

	ei->fd = 0;

	ei->op.proc_get_link = NULL;

	ei->pde = NULL;

	inode = &ei->vfs_inode;

fs/proc/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline struct task_struct *proc_task(struct inode *inode) 
	return PROC_I(inode)->task;

}



static inline int proc_type(struct inode *inode)

static inline int proc_fd(struct inode *inode)

{

	return PROC_I(inode)->type;

	return PROC_I(inode)->fd;

}

include/linux/proc_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ extern void kclist_add(struct kcore_list *, void *, size_t); 


struct proc_inode {

	struct task_struct *task;

	int type;

	int fd;

	union {

		int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);

		int (*proc_read)(struct task_struct *task, char *page);