The patch titled
proc: Replace proc_inode.type with proc_inode.fd
has been removed from the -mm tree. Its filename is
proc-replace-proc_inodetype-with-proc_inodefd.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: proc: Replace proc_inode.type with proc_inode.fd
From: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
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: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/proc/base.c | 6 +++---
fs/proc/inode.c | 2 +-
fs/proc/internal.h | 4 ++--
include/linux/proc_fs.h | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff -puN fs/proc/base.c~proc-replace-proc_inodetype-with-proc_inodefd fs/proc/base.c
--- a/fs/proc/base.c~proc-replace-proc_inodetype-with-proc_inodefd
+++ a/fs/proc/base.c
@@ -297,7 +297,7 @@ static int proc_fd_link(struct inode *in
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
*/
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 dent
{
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(stru
if (!inode)
goto out;
ei = PROC_I(inode);
+ ei->fd = fd;
files = get_files_struct(task);
if (!files)
goto out_unlock;
diff -puN fs/proc/inode.c~proc-replace-proc_inodetype-with-proc_inodefd fs/proc/inode.c
--- a/fs/proc/inode.c~proc-replace-proc_inodetype-with-proc_inodefd
+++ a/fs/proc/inode.c
@@ -95,7 +95,7 @@ static struct inode *proc_alloc_inode(st
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;
diff -puN fs/proc/internal.h~proc-replace-proc_inodetype-with-proc_inodefd fs/proc/internal.h
--- a/fs/proc/internal.h~proc-replace-proc_inodetype-with-proc_inodefd
+++ a/fs/proc/internal.h
@@ -46,7 +46,7 @@ static inline struct task_struct *proc_t
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;
}
diff -puN include/linux/proc_fs.h~proc-replace-proc_inodetype-with-proc_inodefd include/linux/proc_fs.h
--- a/include/linux/proc_fs.h~proc-replace-proc_inodetype-with-proc_inodefd
+++ a/include/linux/proc_fs.h
@@ -249,7 +249,7 @@ extern void kclist_add(struct kcore_list
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);
_
Patches currently in -mm which might be from ebiederm@xxxxxxxxxxxx are
origin.patch
powerpc-adding-the-use-of-the-firmware-soft-reset-nmi-to-kdump.patch
proc-sysctl-add-_proc_do_string-helper.patch
namespaces-add-nsproxy.patch
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-incorporate-fs-namespace-into-nsproxy.patch
namespaces-utsname-introduce-temporary-helpers.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch
namespaces-utsname-switch-to-using-uts-namespaces-cleanup.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-implement-utsname-namespaces-export.patch
namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-sysctl-hack-cleanup.patch
namespaces-utsname-sysctl-hack-cleanup-2.patch
namespaces-utsname-sysctl-hack-cleanup-2-fix.patch
namespaces-utsname-remove-system_utsname.patch
namespaces-utsname-implement-clone_newuts-flag.patch
uts-copy-nsproxy-only-when-needed.patch
ipc-namespace-core-fix.patch
ipc-namespace-core-unshare-fix.patch
ipc-namespace-utils-compilation-fix.patch
genirq-irq-document-what-an-irq-is.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
