[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>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 9369010f3f16..36aa1fcb90a5 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