Replace-Subject: Change pid accesses: include/. From: Serge Hallyn Change pid accesses under include/. Signed-off-by: Dave Hansen Signed-off-by: Serge Hallyn --- include/linux/reiserfs_fs.h | 2 +- include/net/scm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.15-rc1/include/linux/reiserfs_fs.h =================================================================== --- linux-2.6.15-rc1.orig/include/linux/reiserfs_fs.h +++ linux-2.6.15-rc1/include/linux/reiserfs_fs.h @@ -83,7 +83,7 @@ void reiserfs_warning(struct super_block if( !( cond ) ) \ reiserfs_panic( NULL, "reiserfs[%i]: assertion " #cond " failed at " \ __FILE__ ":%i:%s: " format "\n", \ - in_interrupt() ? -1 : current -> pid, __LINE__ , __FUNCTION__ , ##args ) + in_interrupt() ? -1 : task_pid(current), __LINE__ , __FUNCTION__ , ##args ) #if defined( CONFIG_REISERFS_CHECK ) #define RFALSE( cond, format, args... ) RASSERT( !( cond ), format, ##args ) Index: linux-2.6.15-rc1/include/net/scm.h =================================================================== --- linux-2.6.15-rc1.orig/include/net/scm.h +++ linux-2.6.15-rc1/include/net/scm.h @@ -40,7 +40,7 @@ static __inline__ int scm_send(struct so memset(scm, 0, sizeof(*scm)); scm->creds.uid = current->uid; scm->creds.gid = current->gid; - scm->creds.pid = current->tgid; + scm->creds.pid = task_tgid(current); if (msg->msg_controllen <= 0) return 0; return __scm_send(sock, msg, scm); --