summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode_item.c
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-01-12 10:29:53 +1100
committerNathan Scott <nathans@sgi.com>2006-01-12 10:29:53 +1100
commit3762ec6bf76cdd32653c409dbad09f7b85807c68 (patch)
treeffe6dbe857d17709c352e0d60a5be8cba3b83400 /fs/xfs/xfs_inode_item.c
parent6ab65429b4871c42bfd0013f7f5e49d40c0642cd (diff)
downloadop-kernel-dev-3762ec6bf76cdd32653c409dbad09f7b85807c68.zip
op-kernel-dev-3762ec6bf76cdd32653c409dbad09f7b85807c68.tar.gz
[XFS] Merge in trivial changes, sync up headers with userspace
equivalents. SGI-PV: 907752 SGI-Modid: xfs-linux-melb:xfs-kern:24961a Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_inode_item.c')
-rw-r--r--fs/xfs/xfs_inode_item.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 9369010..36aa1fc 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -608,7 +608,7 @@ xfs_inode_item_trylock(
if (iip->ili_pushbuf_flag == 0) {
iip->ili_pushbuf_flag = 1;
#ifdef DEBUG
- iip->ili_push_owner = get_thread_id();
+ iip->ili_push_owner = current_pid();
#endif
/*
* Inode is left locked in shared mode.
@@ -787,7 +787,7 @@ xfs_inode_item_pushbuf(
* trying to duplicate our effort.
*/
ASSERT(iip->ili_pushbuf_flag != 0);
- ASSERT(iip->ili_push_owner == get_thread_id());
+ ASSERT(iip->ili_push_owner == current_pid());
/*
* If flushlock isn't locked anymore, chances are that the
OpenPOWER on IntegriCloud