lkml.org 
[lkml]   [2006]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRFC [patch 03/34] PID Virtualization Change pid accesses: filesystems.
    Change pid accesses for filesystems.

    Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
    Signed-off-by: Serge Hallyn <serue@us.ibm.com>
    ---
    9p/debug.h | 4 ++--
    9p/fid.c | 5 +++--
    afs/cmservice.c | 2 +-
    afs/kafsasyncd.c | 2 +-
    afs/kafstimod.c | 2 +-
    autofs/root.c | 2 +-
    autofs4/autofs_i.h | 2 +-
    autofs4/root.c | 2 +-
    binfmt_elf.c | 8 ++++----
    binfmt_elf_fdpic.c | 2 +-
    binfmt_flat.c | 2 +-
    cifs/cifssmb.c | 2 +-
    cifs/connect.c | 2 +-
    cifs/dir.c | 2 +-
    cifs/file.c | 4 ++--
    cifs/misc.c | 4 ++--
    cifs/transport.c | 2 +-
    coda/upcall.c | 2 +-
    compat.c | 2 +-
    devfs/base.c | 2 +-
    dnotify.c | 2 +-
    exec.c | 8 ++++----
    ext2/inode.c | 2 +-
    ext3/inode.c | 2 +-
    fs-writeback.c | 2 +-
    fuse/dev.c | 2 +-
    jffs2/background.c | 2 +-
    jffs2/debug.h | 8 ++++----
    lockd/clntproc.c | 2 +-
    lockd/svc.c | 6 +++---
    locks.c | 16 ++++++++--------
    nfs/callback.c | 2 +-
    nfs/nfs3proc.c | 2 +-
    nfs/nfs4proc.c | 2 +-
    nfsd/nfs4state.c | 8 ++++----
    nfsd/vfs.c | 6 +++---
    proc/array.c | 12 +++++++-----
    proc/base.c | 16 ++++++++--------
    smbfs/proc.c | 4 ++--
    smbfs/smbiod.c | 4 ++--
    xfs/linux-2.6/xfs_buf.c | 2 +-
    xfs/linux-2.6/xfs_linux.h | 2 +-
    xfs/support/debug.c | 2 +-
    43 files changed, 86 insertions(+), 83 deletions(-)

    Index: linux-2.6.15/fs/9p/debug.h
    ===================================================================
    --- linux-2.6.15.orig/fs/9p/debug.h 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/9p/debug.h 2006-01-17 08:36:57.000000000 -0500
    @@ -39,13 +39,13 @@
    do { \
    if((v9fs_debug_level & level)==level) \
    printk(KERN_NOTICE "-- %s (%d): " \
    - format , __FUNCTION__, current->pid , ## arg); \
    + format , __FUNCTION__, task_pid(current) , ## arg); \
    } while(0)

    #define eprintk(level, format, arg...) \
    do { \
    printk(level "v9fs: %s (%d): " \
    - format , __FUNCTION__, current->pid , ## arg); \
    + format , __FUNCTION__, task_pid(current) , ## arg); \
    } while(0)

    #if DEBUG_DUMP_PKT
    Index: linux-2.6.15/fs/9p/fid.c
    ===================================================================
    --- linux-2.6.15.orig/fs/9p/fid.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/9p/fid.c 2006-01-17 08:36:57.000000000 -0500
    @@ -60,7 +60,7 @@
    }

    fid->uid = current->uid;
    - fid->pid = current->pid;
    + fid->pid = task_pid(current);
    list_add(&fid->list, fid_list);
    return 0;
    }
    @@ -242,7 +242,8 @@
    ret = NULL;
    if (fid_list) {
    list_for_each_entry_safe(fid, ftmp, fid_list, list) {
    - if (fid->fidcreate && fid->pid == current->pid) {
    + if (fid->fidcreate && fid->pid ==
    + task_pid(current)) {
    list_del(&fid->list);
    ret = fid;
    break;
    Index: linux-2.6.15/fs/afs/cmservice.c
    ===================================================================
    --- linux-2.6.15.orig/fs/afs/cmservice.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/afs/cmservice.c 2006-01-17 08:36:57.000000000 -0500
    @@ -118,7 +118,7 @@
    _SRXAFSCM_xxxx_t func;
    int die;

    - printk("kAFS: Started kafscmd %d\n", current->pid);
    + printk("kAFS: Started kafscmd %d\n", task_pid(current));

    daemonize("kafscmd");

    Index: linux-2.6.15/fs/afs/kafsasyncd.c
    ===================================================================
    --- linux-2.6.15.orig/fs/afs/kafsasyncd.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/afs/kafsasyncd.c 2006-01-17 08:36:57.000000000 -0500
    @@ -92,7 +92,7 @@

    kafsasyncd_task = current;

    - printk("kAFS: Started kafsasyncd %d\n", current->pid);
    + printk("kAFS: Started kafsasyncd %d\n", task_pid(current));

    daemonize("kafsasyncd");

    Index: linux-2.6.15/fs/afs/kafstimod.c
    ===================================================================
    --- linux-2.6.15.orig/fs/afs/kafstimod.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/afs/kafstimod.c 2006-01-17 08:36:57.000000000 -0500
    @@ -69,7 +69,7 @@

    DECLARE_WAITQUEUE(myself, current);

    - printk("kAFS: Started kafstimod %d\n", current->pid);
    + printk("kAFS: Started kafstimod %d\n", task_pid(current));

    daemonize("kafstimod");

    Index: linux-2.6.15/fs/autofs/root.c
    ===================================================================
    --- linux-2.6.15.orig/fs/autofs/root.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/autofs/root.c 2006-01-17 08:36:57.000000000 -0500
    @@ -213,7 +213,7 @@

    oz_mode = autofs_oz_mode(sbi);
    DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d\n",
    - current->pid, process_group(current), sbi->catatonic, oz_mode));
    + task_pid(current), process_group(current), sbi->catatonic, oz_mode));

    /*
    * Mark the dentry incomplete, but add it. This is needed so
    Index: linux-2.6.15/fs/autofs4/autofs_i.h
    ===================================================================
    --- linux-2.6.15.orig/fs/autofs4/autofs_i.h 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/autofs4/autofs_i.h 2006-01-17 08:36:57.000000000 -0500
    @@ -33,7 +33,7 @@
    /* #define DEBUG */

    #ifdef DEBUG
    -#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __FUNCTION__ , ##args); } while(0)
    +#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , task_pid(current) , __FUNCTION__ , ##args); } while(0)
    #else
    #define DPRINTK(fmt,args...) do {} while(0)
    #endif
    Index: linux-2.6.15/fs/autofs4/root.c
    ===================================================================
    --- linux-2.6.15.orig/fs/autofs4/root.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/autofs4/root.c 2006-01-17 08:36:57.000000000 -0500
    @@ -465,7 +465,7 @@

    oz_mode = autofs4_oz_mode(sbi);
    DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
    - current->pid, process_group(current), sbi->catatonic, oz_mode);
    + task_pid(current), process_group(current), sbi->catatonic, oz_mode);

    /*
    * Mark the dentry incomplete, but add it. This is needed so
    Index: linux-2.6.15/fs/binfmt_elf.c
    ===================================================================
    --- linux-2.6.15.orig/fs/binfmt_elf.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/binfmt_elf.c 2006-01-17 08:36:57.000000000 -0500
    @@ -1270,8 +1270,8 @@
    prstatus->pr_info.si_signo = prstatus->pr_cursig = signr;
    prstatus->pr_sigpend = p->pending.signal.sig[0];
    prstatus->pr_sighold = p->blocked.sig[0];
    - prstatus->pr_pid = p->pid;
    - prstatus->pr_ppid = p->parent->pid;
    + prstatus->pr_pid = task_pid(p);
    + prstatus->pr_ppid = task_pid(p->parent);
    prstatus->pr_pgrp = process_group(p);
    prstatus->pr_sid = p->signal->session;
    if (thread_group_leader(p)) {
    @@ -1316,8 +1316,8 @@
    psinfo->pr_psargs[i] = ' ';
    psinfo->pr_psargs[len] = 0;

    - psinfo->pr_pid = p->pid;
    - psinfo->pr_ppid = p->parent->pid;
    + psinfo->pr_pid = task_pid(p);
    + psinfo->pr_ppid = task_pid(p->parent);
    psinfo->pr_pgrp = process_group(p);
    psinfo->pr_sid = p->signal->session;

    Index: linux-2.6.15/fs/binfmt_elf_fdpic.c
    ===================================================================
    --- linux-2.6.15.orig/fs/binfmt_elf_fdpic.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/binfmt_elf_fdpic.c 2006-01-17 08:36:57.000000000 -0500
    @@ -479,7 +479,7 @@
    * removed for 2.5
    */
    if (smp_num_siblings > 1)
    - sp = sp - ((current->pid % 64) << 7);
    + sp = sp - ((task_pid(current) % 64) << 7);
    #endif

    sp &= ~7UL;
    Index: linux-2.6.15/fs/binfmt_flat.c
    ===================================================================
    --- linux-2.6.15.orig/fs/binfmt_flat.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/binfmt_flat.c 2006-01-17 08:36:57.000000000 -0500
    @@ -95,7 +95,7 @@
    static int flat_core_dump(long signr, struct pt_regs * regs, struct file *file)
    {
    printk("Process %s:%d received signr %d and should have core dumped\n",
    - current->comm, current->pid, (int) signr);
    + current->comm, task_pid(current), (int) signr);
    return(1);
    }

    Index: linux-2.6.15/fs/cifs/cifssmb.c
    ===================================================================
    --- linux-2.6.15.orig/fs/cifs/cifssmb.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/cifs/cifssmb.c 2006-01-17 08:36:57.000000000 -0500
    @@ -1274,7 +1274,7 @@
    pSMB->Fid = smb_file_id; /* netfid stays le */

    if((numLock != 0) || (numUnlock != 0)) {
    - pSMB->Locks[0].Pid = cpu_to_le16(current->tgid);
    + pSMB->Locks[0].Pid = cpu_to_le16(task_tgid(current));
    /* BB where to store pid high? */
    pSMB->Locks[0].LengthLow = cpu_to_le32((u32)len);
    pSMB->Locks[0].LengthHigh = cpu_to_le32((u32)(len>>32));
    Index: linux-2.6.15/fs/cifs/connect.c
    ===================================================================
    --- linux-2.6.15.orig/fs/cifs/connect.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/cifs/connect.c 2006-01-17 08:36:57.000000000 -0500
    @@ -345,7 +345,7 @@
    allow_signal(SIGKILL);
    current->flags |= PF_MEMALLOC;
    server->tsk = current; /* save process info to wake at shutdown */
    - cFYI(1, ("Demultiplex PID: %d", current->pid));
    + cFYI(1, ("Demultiplex PID: %d", task_pid(current)));
    write_lock(&GlobalSMBSeslock);
    atomic_inc(&tcpSesAllocCount);
    length = tcpSesAllocCount.counter;
    Index: linux-2.6.15/fs/cifs/dir.c
    ===================================================================
    --- linux-2.6.15.orig/fs/cifs/dir.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/cifs/dir.c 2006-01-17 08:36:57.000000000 -0500
    @@ -262,7 +262,7 @@
    memset((char *)pCifsFile, 0,
    sizeof (struct cifsFileInfo));
    pCifsFile->netfid = fileHandle;
    - pCifsFile->pid = current->tgid;
    + pCifsFile->pid = task_tgid(current);
    pCifsFile->pInode = newinode;
    pCifsFile->invalidHandle = FALSE;
    pCifsFile->closePend = FALSE;
    Index: linux-2.6.15/fs/cifs/file.c
    ===================================================================
    --- linux-2.6.15.orig/fs/cifs/file.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/cifs/file.c 2006-01-17 08:36:57.000000000 -0500
    @@ -45,7 +45,7 @@
    {
    memset(private_data, 0, sizeof(struct cifsFileInfo));
    private_data->netfid = netfid;
    - private_data->pid = current->tgid;
    + private_data->pid = task_tgid(current);
    init_MUTEX(&private_data->fh_sem);
    private_data->pfile = file; /* needed for writepage */
    private_data->pInode = inode;
    @@ -182,7 +182,7 @@
    pCifsFile = list_entry(tmp, struct cifsFileInfo,
    flist);
    if ((pCifsFile->pfile == NULL) &&
    - (pCifsFile->pid == current->tgid)) {
    + (pCifsFile->pid == task_tgid(current))) {
    /* mode set in cifs_create */

    /* needed for writepage */
    Index: linux-2.6.15/fs/cifs/misc.c
    ===================================================================
    --- linux-2.6.15.orig/fs/cifs/misc.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/cifs/misc.c 2006-01-17 08:36:57.000000000 -0500
    @@ -308,8 +308,8 @@
    buffer->Command = smb_command;
    buffer->Flags = 0x00; /* case sensitive */
    buffer->Flags2 = SMBFLG2_KNOWS_LONG_NAMES;
    - buffer->Pid = cpu_to_le16((__u16)current->tgid);
    - buffer->PidHigh = cpu_to_le16((__u16)(current->tgid >> 16));
    + buffer->Pid = cpu_to_le16((__u16)task_tgid(current));
    + buffer->PidHigh = cpu_to_le16((__u16)(task_tgid(current) >> 16));
    spin_lock(&GlobalMid_Lock);
    spin_unlock(&GlobalMid_Lock);
    if (treeCon) {
    Index: linux-2.6.15/fs/cifs/transport.c
    ===================================================================
    --- linux-2.6.15.orig/fs/cifs/transport.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/cifs/transport.c 2006-01-17 08:36:57.000000000 -0500
    @@ -56,7 +56,7 @@
    else {
    memset(temp, 0, sizeof (struct mid_q_entry));
    temp->mid = smb_buffer->Mid; /* always LE */
    - temp->pid = current->pid;
    + temp->pid = task_pid(current);
    temp->command = smb_buffer->Command;
    cFYI(1, ("For smb_command %d", temp->command));
    /* do_gettimeofday(&temp->when_sent);*/ /* easier to use jiffies */
    Index: linux-2.6.15/fs/coda/upcall.c
    ===================================================================
    --- linux-2.6.15.orig/fs/coda/upcall.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/coda/upcall.c 2006-01-17 08:36:57.000000000 -0500
    @@ -52,7 +52,7 @@
    return ERR_PTR(-ENOMEM);

    inp->ih.opcode = opcode;
    - inp->ih.pid = current->pid;
    + inp->ih.pid = task_pid(current);
    inp->ih.pgid = process_group(current);
    #ifdef CONFIG_CODA_FS_OLD_API
    memset(&inp->ih.cred, 0, sizeof(struct coda_cred));
    Index: linux-2.6.15/fs/compat.c
    ===================================================================
    --- linux-2.6.15.orig/fs/compat.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/compat.c 2006-01-17 08:36:57.000000000 -0500
    @@ -331,7 +331,7 @@
    sprintf(buf, "%02x", buf[1]);
    printk("ioctl32(%s:%d): Unknown cmd fd(%d) "
    "cmd(%08x){%s} arg(%08x) on %s\n",
    - current->comm, current->pid,
    + current->comm, task_pid(current),
    (int)fd, (unsigned int)cmd, buf,
    (unsigned int)arg, fn);

    Index: linux-2.6.15/fs/devfs/base.c
    ===================================================================
    --- linux-2.6.15.orig/fs/devfs/base.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/devfs/base.c 2006-01-17 08:36:57.000000000 -0500
    @@ -2695,7 +2695,7 @@
    spin_unlock(&lock);
    fs_info->devfsd_pgrp =
    (process_group(current) ==
    - current->pid) ? process_group(current) : 0;
    + task_pid(current)) ? process_group(current) : 0;
    fs_info->devfsd_file = file;
    fs_info->devfsd_info =
    kmalloc(sizeof *fs_info->devfsd_info, GFP_KERNEL);
    Index: linux-2.6.15/fs/dnotify.c
    ===================================================================
    --- linux-2.6.15.orig/fs/dnotify.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/dnotify.c 2006-01-17 08:36:57.000000000 -0500
    @@ -92,7 +92,7 @@
    prev = &odn->dn_next;
    }

    - error = f_setown(filp, current->pid, 0);
    + error = f_setown(filp, task_pid(current), 0);
    if (error)
    goto out_free;

    Index: linux-2.6.15/fs/exec.c
    ===================================================================
    --- linux-2.6.15.orig/fs/exec.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/exec.c 2006-01-17 08:36:57.000000000 -0500
    @@ -675,8 +675,8 @@
    proc_dentry2 = proc_pid_unhash(leader);
    write_lock_irq(&tasklist_lock);

    - BUG_ON(leader->tgid != current->tgid);
    - BUG_ON(current->pid == current->tgid);
    + BUG_ON(task_tgid(leader) != task_tgid(current));
    + BUG_ON(task_pid(current) == task_tgid(current));
    /*
    * An exec() starts a new thread group with the
    * TGID of the previous thread group. Rehash the
    @@ -1282,7 +1282,7 @@
    case 'p':
    pid_in_pattern = 1;
    rc = snprintf(out_ptr, out_end - out_ptr,
    - "%d", current->tgid);
    + "%d", task_tgid(current));
    if (rc > out_end - out_ptr)
    goto out;
    out_ptr += rc;
    @@ -1354,7 +1354,7 @@
    if (!pid_in_pattern
    && (core_uses_pid || atomic_read(&current->mm->mm_users) != 1)) {
    rc = snprintf(out_ptr, out_end - out_ptr,
    - ".%d", current->tgid);
    + ".%d", task_tgid(current));
    if (rc > out_end - out_ptr)
    goto out;
    out_ptr += rc;
    Index: linux-2.6.15/fs/ext2/inode.c
    ===================================================================
    --- linux-2.6.15.orig/fs/ext2/inode.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/ext2/inode.c 2006-01-17 08:36:57.000000000 -0500
    @@ -344,7 +344,7 @@
    */
    bg_start = (ei->i_block_group * EXT2_BLOCKS_PER_GROUP(inode->i_sb)) +
    le32_to_cpu(EXT2_SB(inode->i_sb)->s_es->s_first_data_block);
    - colour = (current->pid % 16) *
    + colour = (task_pid(current) % 16) *
    (EXT2_BLOCKS_PER_GROUP(inode->i_sb) / 16);
    return bg_start + colour;
    }
    Index: linux-2.6.15/fs/ext3/inode.c
    ===================================================================
    --- linux-2.6.15.orig/fs/ext3/inode.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/ext3/inode.c 2006-01-17 08:36:57.000000000 -0500
    @@ -443,7 +443,7 @@
    */
    bg_start = (ei->i_block_group * EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
    le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
    - colour = (current->pid % 16) *
    + colour = (task_pid(current) % 16) *
    (EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
    return bg_start + colour;
    }
    Index: linux-2.6.15/fs/fs-writeback.c
    ===================================================================
    --- linux-2.6.15.orig/fs/fs-writeback.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/fs-writeback.c 2006-01-17 08:36:57.000000000 -0500
    @@ -89,7 +89,7 @@
    if (inode->i_ino || strcmp(inode->i_sb->s_id, "bdev"))
    printk(KERN_DEBUG
    "%s(%d): dirtied inode %lu (%s) on %s\n",
    - current->comm, current->pid, inode->i_ino,
    + current->comm, task_pid(current), inode->i_ino,
    name, inode->i_sb->s_id);
    }

    Index: linux-2.6.15/fs/fuse/dev.c
    ===================================================================
    --- linux-2.6.15.orig/fs/fuse/dev.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/fuse/dev.c 2006-01-17 08:36:57.000000000 -0500
    @@ -99,7 +99,7 @@
    req->preallocated = 1;
    req->in.h.uid = current->fsuid;
    req->in.h.gid = current->fsgid;
    - req->in.h.pid = current->pid;
    + req->in.h.pid = task_pid(current);
    return req;
    }

    Index: linux-2.6.15/fs/jffs2/background.c
    ===================================================================
    --- linux-2.6.15.orig/fs/jffs2/background.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/jffs2/background.c 2006-01-17 08:36:57.000000000 -0500
    @@ -60,7 +60,7 @@
    int wait = 0;
    spin_lock(&c->erase_completion_lock);
    if (c->gc_task) {
    - D1(printk(KERN_DEBUG "jffs2: Killing GC task %d\n", c->gc_task->pid));
    + D1(printk(KERN_DEBUG "jffs2: Killing GC task %d\n", c->gc_task_pid(task)));
    send_sig(SIGKILL, c->gc_task, 1);
    wait = 1;
    }
    Index: linux-2.6.15/fs/lockd/clntproc.c
    ===================================================================
    --- linux-2.6.15.orig/fs/lockd/clntproc.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/lockd/clntproc.c 2006-01-17 08:36:57.000000000 -0500
    @@ -130,7 +130,7 @@
    lock->caller = system_utsname.nodename;
    lock->oh.data = req->a_owner;
    lock->oh.len = sprintf(req->a_owner, "%d@%s",
    - current->pid, system_utsname.nodename);
    + task_pid(current), system_utsname.nodename);
    locks_copy_lock(&lock->fl, fl);
    }

    Index: linux-2.6.15/fs/lockd/svc.c
    ===================================================================
    --- linux-2.6.15.orig/fs/lockd/svc.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/lockd/svc.c 2006-01-17 08:36:57.000000000 -0500
    @@ -111,7 +111,7 @@
    /*
    * Let our maker know we're running.
    */
    - nlmsvc_pid = current->pid;
    + nlmsvc_pid = task_pid(current);
    up(&lockd_start);

    daemonize("lockd");
    @@ -135,7 +135,7 @@
    * NFS mount or NFS daemon has gone away, and we've been sent a
    * signal, or else another process has taken over our job.
    */
    - while ((nlmsvc_users || !signalled()) && nlmsvc_pid == current->pid) {
    + while ((nlmsvc_users || !signalled()) && nlmsvc_pid == task_pid(current)) {
    long timeout = MAX_SCHEDULE_TIMEOUT;

    if (signalled()) {
    @@ -182,7 +182,7 @@
    * Check whether there's a new lockd process before
    * shutting down the hosts and clearing the slot.
    */
    - if (!nlmsvc_pid || current->pid == nlmsvc_pid) {
    + if (!nlmsvc_pid || task_pid(current) == nlmsvc_pid) {
    if (nlmsvc_ops)
    nlmsvc_invalidate_all();
    nlm_shutdown_hosts();
    Index: linux-2.6.15/fs/locks.c
    ===================================================================
    --- linux-2.6.15.orig/fs/locks.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/locks.c 2006-01-17 08:36:57.000000000 -0500
    @@ -268,7 +268,7 @@
    return -ENOMEM;

    fl->fl_file = filp;
    - fl->fl_pid = current->tgid;
    + fl->fl_pid = task_tgid(current);
    fl->fl_flags = FL_FLOCK;
    fl->fl_type = type;
    fl->fl_end = OFFSET_MAX;
    @@ -334,7 +334,7 @@
    return -EOVERFLOW;

    fl->fl_owner = current->files;
    - fl->fl_pid = current->tgid;
    + fl->fl_pid = task_tgid(current);
    fl->fl_file = filp;
    fl->fl_flags = FL_POSIX;
    fl->fl_ops = NULL;
    @@ -380,7 +380,7 @@
    return -EOVERFLOW;

    fl->fl_owner = current->files;
    - fl->fl_pid = current->tgid;
    + fl->fl_pid = task_tgid(current);
    fl->fl_file = filp;
    fl->fl_flags = FL_POSIX;
    fl->fl_ops = NULL;
    @@ -433,7 +433,7 @@
    static int lease_init(struct file *filp, int type, struct file_lock *fl)
    {
    fl->fl_owner = current->files;
    - fl->fl_pid = current->tgid;
    + fl->fl_pid = task_tgid(current);

    fl->fl_file = filp;
    fl->fl_flags = FL_LEASE;
    @@ -1043,7 +1043,7 @@

    locks_init_lock(&fl);
    fl.fl_owner = current->files;
    - fl.fl_pid = current->tgid;
    + fl.fl_pid = task_tgid(current);
    fl.fl_file = filp;
    fl.fl_flags = FL_POSIX | FL_ACCESS;
    if (filp && !(filp->f_flags & O_NONBLOCK))
    @@ -1441,7 +1441,7 @@
    goto out_unlock;
    }

    - error = f_setown(filp, current->pid, 0);
    + error = f_setown(filp, task_pid(current), 0);
    out_unlock:
    unlock_kernel();
    return error;
    @@ -1860,7 +1860,7 @@
    lock.fl_start = 0;
    lock.fl_end = OFFSET_MAX;
    lock.fl_owner = owner;
    - lock.fl_pid = current->tgid;
    + lock.fl_pid = task_tgid(current);
    lock.fl_file = filp;
    lock.fl_ops = NULL;
    lock.fl_lmops = NULL;
    @@ -1904,7 +1904,7 @@

    if (filp->f_op && filp->f_op->flock) {
    struct file_lock fl = {
    - .fl_pid = current->tgid,
    + .fl_pid = task_tgid(current),
    .fl_file = filp,
    .fl_flags = FL_FLOCK,
    .fl_type = F_UNLCK,
    Index: linux-2.6.15/fs/nfs/callback.c
    ===================================================================
    --- linux-2.6.15.orig/fs/nfs/callback.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/nfs/callback.c 2006-01-17 08:36:57.000000000 -0500
    @@ -44,7 +44,7 @@
    __module_get(THIS_MODULE);
    lock_kernel();

    - nfs_callback_info.pid = current->pid;
    + nfs_callback_info.pid = task_pid(current);
    daemonize("nfsv4-svc");
    /* Process request with signals blocked, but allow SIGKILL. */
    allow_signal(SIGKILL);
    Index: linux-2.6.15/fs/nfs/nfs3proc.c
    ===================================================================
    --- linux-2.6.15.orig/fs/nfs/nfs3proc.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/nfs/nfs3proc.c 2006-01-17 08:36:57.000000000 -0500
    @@ -323,7 +323,7 @@
    if (flags & O_EXCL) {
    arg.createmode = NFS3_CREATE_EXCLUSIVE;
    arg.verifier[0] = jiffies;
    - arg.verifier[1] = current->pid;
    + arg.verifier[1] = task_pid(current);
    }

    sattr->ia_mode &= ~current->fs->umask;
    Index: linux-2.6.15/fs/nfs/nfs4proc.c
    ===================================================================
    --- linux-2.6.15.orig/fs/nfs/nfs4proc.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/nfs/nfs4proc.c 2006-01-17 08:36:57.000000000 -0500
    @@ -724,7 +724,7 @@
    if (flags & O_EXCL) {
    u32 *p = (u32 *) o_arg.u.verifier.data;
    p[0] = jiffies;
    - p[1] = current->pid;
    + p[1] = task_pid(current);
    } else
    o_arg.u.attrs = sattr;
    /* Serialization for the sequence id */
    Index: linux-2.6.15/fs/nfsd/nfs4state.c
    ===================================================================
    --- linux-2.6.15.orig/fs/nfsd/nfs4state.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/nfsd/nfs4state.c 2006-01-17 08:36:57.000000000 -0500
    @@ -1740,7 +1740,7 @@
    fl.fl_end = OFFSET_MAX;
    fl.fl_owner = (fl_owner_t)dp;
    fl.fl_file = stp->st_vfs_file;
    - fl.fl_pid = current->tgid;
    + fl.fl_pid = task_tgid(current);

    /* setlease checks to see if delegation should be handed out.
    * the lock_manager callbacks fl_mylease and fl_change are used
    @@ -2784,7 +2784,7 @@
    goto out;
    }
    file_lock.fl_owner = (fl_owner_t)lock_sop;
    - file_lock.fl_pid = current->tgid;
    + file_lock.fl_pid = task_tgid(current);
    file_lock.fl_file = filp;
    file_lock.fl_flags = FL_POSIX;

    @@ -2903,7 +2903,7 @@
    &lockt->lt_clientid, &lockt->lt_owner);
    if (lockt->lt_stateowner)
    file_lock.fl_owner = (fl_owner_t)lockt->lt_stateowner;
    - file_lock.fl_pid = current->tgid;
    + file_lock.fl_pid = task_tgid(current);
    file_lock.fl_flags = FL_POSIX;

    file_lock.fl_start = lockt->lt_offset;
    @@ -2962,7 +2962,7 @@
    locks_init_lock(&file_lock);
    file_lock.fl_type = F_UNLCK;
    file_lock.fl_owner = (fl_owner_t) locku->lu_stateowner;
    - file_lock.fl_pid = current->tgid;
    + file_lock.fl_pid = task_tgid(current);
    file_lock.fl_file = filp;
    file_lock.fl_flags = FL_POSIX;
    file_lock.fl_start = locku->lu_offset;
    Index: linux-2.6.15/fs/nfsd/vfs.c
    ===================================================================
    --- linux-2.6.15.orig/fs/nfsd/vfs.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/nfsd/vfs.c 2006-01-17 08:36:57.000000000 -0500
    @@ -955,13 +955,13 @@
    if (EX_WGATHER(exp)) {
    if (atomic_read(&inode->i_writecount) > 1
    || (last_ino == inode->i_ino && last_dev == inode->i_sb->s_dev)) {
    - dprintk("nfsd: write defer %d\n", current->pid);
    + dprintk("nfsd: write defer %d\n", task_pid(current));
    msleep(10);
    - dprintk("nfsd: write resume %d\n", current->pid);
    + dprintk("nfsd: write resume %d\n", task_pid(current));
    }

    if (inode->i_state & I_DIRTY) {
    - dprintk("nfsd: write sync %d\n", current->pid);
    + dprintk("nfsd: write sync %d\n", task_pid(current));
    nfsd_sync(file);
    }
    #if 0
    Index: linux-2.6.15/fs/proc/array.c
    ===================================================================
    --- linux-2.6.15.orig/fs/proc/array.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/proc/array.c 2006-01-17 08:36:57.000000000 -0500
    @@ -174,9 +174,10 @@
    "Gid:\t%d\t%d\t%d\t%d\n",
    get_task_state(p),
    (p->sleep_avg/1024)*100/(1020000000/1024),
    - p->tgid,
    - p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0,
    - pid_alive(p) && p->ptrace ? p->parent->pid : 0,
    + task_tgid(p),
    + task_pid(p), pid_alive(p) ?
    + task_tgid(p->group_leader->real_parent) : 0,
    + pid_alive(p) && p->ptrace ? task_pid(p->parent) : 0,
    p->uid, p->euid, p->suid, p->fsuid,
    p->gid, p->egid, p->sgid, p->fsgid);
    read_unlock(&tasklist_lock);
    @@ -388,7 +389,8 @@
    }
    it_real_value = task->signal->it_real_value;
    }
    - ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0;
    + ppid = pid_alive(task) ?
    + task_tgid(task->group_leader->real_parent) : 0;
    read_unlock(&tasklist_lock);

    if (!whole || num_threads<2)
    @@ -415,7 +417,7 @@
    res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
    %lu %lu %lu %lu %lu %ld %ld %ld %ld %d %ld %llu %lu %ld %lu %lu %lu %lu %lu \
    %lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
    - task->pid,
    + task_pid(task),
    tcomm,
    state,
    ppid,
    Index: linux-2.6.15/fs/proc/base.c
    ===================================================================
    --- linux-2.6.15.orig/fs/proc/base.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/proc/base.c 2006-01-17 08:36:57.000000000 -0500
    @@ -1160,7 +1160,7 @@
    if (!pid_alive(p))
    goto out;
    retval = 0;
    - tid = p->pid;
    + tid = task_pid(p);

    fd = filp->f_pos;
    switch (fd) {
    @@ -1227,7 +1227,7 @@
    goto out;

    ret = 0;
    - pid = proc_task(inode)->pid;
    + pid = task_pid(proc_task(inode));
    i = filp->f_pos;
    switch (i) {
    case 0:
    @@ -1312,7 +1312,7 @@
    ei = PROC_I(inode);
    ei->task = NULL;
    inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
    - inode->i_ino = fake_ino(task->pid, ino);
    + inode->i_ino = fake_ino(task_pid(task), ino);

    if (!pid_alive(task))
    goto out_unlock;
    @@ -1878,14 +1878,14 @@
    int buflen)
    {
    char tmp[30];
    - sprintf(tmp, "%d", current->tgid);
    + sprintf(tmp, "%d", task_tgid(current));
    return vfs_readlink(dentry,buffer,buflen,tmp);
    }

    static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
    {
    char tmp[30];
    - sprintf(tmp, "%d", current->tgid);
    + sprintf(tmp, "%d", task_tgid(current));
    return ERR_PTR(vfs_follow_link(nd,tmp));
    }

    @@ -2042,7 +2042,7 @@
    read_unlock(&tasklist_lock);
    if (!task)
    goto out;
    - if (leader->tgid != task->tgid)
    + if (task_tgid(leader) != task_tgid(task))
    goto out_drop_task;

    inode = proc_pid_make_inode(dir->i_sb, task, PROC_TID_INO);
    @@ -2100,7 +2100,7 @@
    p = next_task(&init_task);

    for ( ; p != &init_task; p = next_task(p)) {
    - int tgid = p->pid;
    + int tgid = task_pid(p);
    if (!pid_alive(p))
    continue;
    if (--index >= 0)
    @@ -2133,7 +2133,7 @@
    * via next_thread().
    */
    if (pid_alive(task)) do {
    - int tid = task->pid;
    + int tid = task_pid(task);

    if (--index >= 0)
    continue;
    Index: linux-2.6.15/fs/smbfs/proc.c
    ===================================================================
    --- linux-2.6.15.orig/fs/smbfs/proc.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/smbfs/proc.c 2006-01-17 08:36:57.000000000 -0500
    @@ -852,7 +852,7 @@
    struct sock *sk;
    int error;

    - VERBOSE("fd=%d, pid=%d\n", opt->fd, current->pid);
    + VERBOSE("fd=%d, pid=%d\n", opt->fd, task_pid(current));

    smb_lock_server(server);

    @@ -876,7 +876,7 @@
    goto out_putf;

    server->sock_file = filp;
    - server->conn_pid = current->pid;
    + server->conn_pid = task_pid(current);
    server->opt = *opt;
    server->generation += 1;
    server->state = CONN_VALID;
    Index: linux-2.6.15/fs/smbfs/smbiod.c
    ===================================================================
    --- linux-2.6.15.orig/fs/smbfs/smbiod.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/smbfs/smbiod.c 2006-01-17 08:36:57.000000000 -0500
    @@ -294,7 +294,7 @@

    allow_signal(SIGKILL);

    - VERBOSE("SMB Kernel thread starting (%d) ...\n", current->pid);
    + VERBOSE("SMB Kernel thread starting (%d) ...\n", task_pid(current));

    for (;;) {
    struct smb_sb_info *server;
    @@ -336,6 +336,6 @@
    spin_unlock(&servers_lock);
    }

    - VERBOSE("SMB Kernel thread exiting (%d) ...\n", current->pid);
    + VERBOSE("SMB Kernel thread exiting (%d) ...\n", task_pid(current));
    module_put_and_exit(0);
    }
    Index: linux-2.6.15/fs/xfs/linux-2.6/xfs_buf.c
    ===================================================================
    --- linux-2.6.15.orig/fs/xfs/linux-2.6/xfs_buf.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/xfs/linux-2.6/xfs_buf.c 2006-01-17 08:36:57.000000000 -0500
    @@ -68,7 +68,7 @@
    #endif

    #ifdef PAGEBUF_LOCK_TRACKING
    -# define PB_SET_OWNER(pb) ((pb)->pb_last_holder = current->pid)
    +# define PB_SET_OWNER(pb) ((pb)->pb_last_holder = task_pid(current))
    # define PB_CLEAR_OWNER(pb) ((pb)->pb_last_holder = -1)
    # define PB_GET_OWNER(pb) ((pb)->pb_last_holder)
    #else
    Index: linux-2.6.15/fs/xfs/linux-2.6/xfs_linux.h
    ===================================================================
    --- linux-2.6.15.orig/fs/xfs/linux-2.6/xfs_linux.h 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/xfs/linux-2.6/xfs_linux.h 2006-01-17 08:36:57.000000000 -0500
    @@ -134,7 +134,7 @@
    #define raw_smp_processor_id() smp_processor_id()
    #endif
    #define current_cpu() raw_smp_processor_id()
    -#define current_pid() (current->pid)
    +#define current_pid() (task_pid(current))
    #define current_fsuid(cred) (current->fsuid)
    #define current_fsgid(cred) (current->fsgid)

    Index: linux-2.6.15/fs/xfs/support/debug.c
    ===================================================================
    --- linux-2.6.15.orig/fs/xfs/support/debug.c 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/xfs/support/debug.c 2006-01-17 08:36:57.000000000 -0500
    @@ -60,7 +60,7 @@
    int
    get_thread_id(void)
    {
    - return current->pid;
    + return task_pid(current);
    }

    #endif /* DEBUG || INDUCE_IO_ERRROR || !NO_WANT_RANDOM */
    Index: linux-2.6.15/fs/jffs2/debug.h
    ===================================================================
    --- linux-2.6.15.orig/fs/jffs2/debug.h 2006-01-17 08:36:28.000000000 -0500
    +++ linux-2.6.15/fs/jffs2/debug.h 2006-01-17 08:36:57.000000000 -0500
    @@ -81,28 +81,28 @@
    #define JFFS2_ERROR(fmt, ...) \
    do { \
    printk(JFFS2_ERR_MSG_PREFIX \
    - " (%d) %s: " fmt, current->pid, \
    + " (%d) %s: " fmt, task_pid(current), \
    __FUNCTION__ , ##__VA_ARGS__); \
    } while(0)

    #define JFFS2_WARNING(fmt, ...) \
    do { \
    printk(JFFS2_WARN_MSG_PREFIX \
    - " (%d) %s: " fmt, current->pid, \
    + " (%d) %s: " fmt, task_pid(current), \
    __FUNCTION__ , ##__VA_ARGS__); \
    } while(0)

    #define JFFS2_NOTICE(fmt, ...) \
    do { \
    printk(JFFS2_NOTICE_MSG_PREFIX \
    - " (%d) %s: " fmt, current->pid, \
    + " (%d) %s: " fmt, task_pid(current), \
    __FUNCTION__ , ##__VA_ARGS__); \
    } while(0)

    #define JFFS2_DEBUG(fmt, ...) \
    do { \
    printk(JFFS2_DBG_MSG_PREFIX \
    - " (%d) %s: " fmt, current->pid, \
    + " (%d) %s: " fmt, task_pid(current), \
    __FUNCTION__ , ##__VA_ARGS__); \
    } while(0)

    --

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-01-17 16:04    [W:0.071 / U:0.464 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site