Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[~andy/linux] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 31e0475c6cb9a1ffd61a0e3ed01921ab6d1ef949..49dfb2ab783e6f921fdd344f1b6c39ee29cd1935 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -62,7 +62,7 @@ static void proc_delete_inode(struct inode *inode)
        truncate_inode_pages(&inode->i_data, 0);
 
        /* Stop tracking associated processes */
-       tref_put(PROC_I(inode)->tref);
+       put_pid(PROC_I(inode)->pid);
 
        /* Let go of any associated proc directory entry */
        de = PROC_I(inode)->pde;
@@ -91,7 +91,7 @@ static struct inode *proc_alloc_inode(struct super_block *sb)
        ei = (struct proc_inode *)kmem_cache_alloc(proc_inode_cachep, SLAB_KERNEL);
        if (!ei)
                return NULL;
-       ei->tref = NULL;
+       ei->pid = NULL;
        ei->fd = 0;
        ei->op.proc_get_link = NULL;
        ei->pde = NULL;
@@ -192,7 +192,7 @@ int proc_fill_super(struct super_block *s, void *data, int silent)
 {
        struct inode * root_inode;
 
-       s->s_flags |= MS_NODIRATIME;
+       s->s_flags |= MS_NODIRATIME | MS_NOSUID | MS_NOEXEC;
        s->s_blocksize = 1024;
        s->s_blocksize_bits = 10;
        s->s_magic = PROC_SUPER_MAGIC;