Change pid accesses under include/.
Signed-off-by: Dave Hansen <[email protected]>
Signed-off-by: Serge Hallyn <[email protected]>
---
linux/reiserfs_fs.h | 2 +-
net/scm.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6.15/include/linux/reiserfs_fs.h
===================================================================
--- linux-2.6.15.orig/include/linux/reiserfs_fs.h 2006-01-17 08:36:28.000000000 -0500
+++ linux-2.6.15/include/linux/reiserfs_fs.h 2006-01-17 08:36:59.000000000 -0500
@@ -83,7 +83,7 @@
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/include/net/scm.h
===================================================================
--- linux-2.6.15.orig/include/net/scm.h 2006-01-17 08:36:28.000000000 -0500
+++ linux-2.6.15/include/net/scm.h 2006-01-17 08:36:59.000000000 -0500
@@ -40,7 +40,7 @@
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);
--