- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 8e2a605..94ee32e 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -32,6 +32,7 @@
 #include <linux/mount.h>
 #include <linux/security.h>
 #include <linux/ptrace.h>
+#include "internal.h"
 
 /*
  * For hysterical raisins we keep the same inumbers as in the old procfs.
@@ -191,21 +192,6 @@ static struct pid_entry tid_attr_stuff[] = {
 
 #undef E
 
-static inline struct task_struct *proc_task(struct inode *inode)
-{
-       return PROC_I(inode)->task;
-}
-
-static inline int proc_type(struct inode *inode)
-{
-       return PROC_I(inode)->type;
-}
-
-int proc_tid_stat(struct task_struct*,char*);
-int proc_tgid_stat(struct task_struct*,char*);
-int proc_pid_status(struct task_struct*,char*);
-int proc_pid_statm(struct task_struct*,char*);
-
 static int proc_fd_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt)
 {
        struct task_struct *task = proc_task(inode);
@@ -230,33 +216,6 @@ static int proc_fd_link(struct inode *inode, struct dentry **dentry, struct vfsm
        return -ENOENT;
 }
 
-static int proc_exe_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt)
-{
-       struct vm_area_struct * vma;
-       int result = -ENOENT;
-       struct task_struct *task = proc_task(inode);
-       struct mm_struct * mm = get_task_mm(task);
-
-       if (!mm)
-               goto out;
-       down_read(&mm->mmap_sem);
-       vma = mm->mmap;
-       while (vma) {
-               if ((vma->vm_flags & VM_EXECUTABLE) && 
-                   vma->vm_file) {
-                       *mnt = mntget(vma->vm_file->f_vfsmnt);
-                       *dentry = dget(vma->vm_file->f_dentry);
-                       result = 0;
-                       break;
-               }
-               vma = vma->vm_next;
-       }
-       up_read(&mm->mmap_sem);
-       mmput(mm);
-out:
-       return result;
-}
-
 static int proc_cwd_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt)
 {
        struct fs_struct *fs;
@@ -413,7 +372,7 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer)
        char *modname;
        const char *sym_name;
        unsigned long wchan, size, offset;
-       char namebuf[128];
+       char namebuf[KSYM_NAME_LEN+1];
 
        wchan = get_wchan(task);