diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-06-26 17:20:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-26 17:20:36 -0400 |
| commit | 7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch) | |
| tree | 82d934ebf07f22a2c64c3b6d82ec24082878b43a /fs/xfs/linux-2.6/xfs_vnode.c | |
| parent | f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff) | |
| parent | 7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff) | |
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_vnode.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c index a832d165f24f..250cad54e892 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.c +++ b/fs/xfs/linux-2.6/xfs_vnode.c | |||
| @@ -411,13 +411,13 @@ vn_remove( | |||
| 411 | /* 0 */ (void *)(__psint_t)(vk), \ | 411 | /* 0 */ (void *)(__psint_t)(vk), \ |
| 412 | /* 1 */ (void *)(s), \ | 412 | /* 1 */ (void *)(s), \ |
| 413 | /* 2 */ (void *)(__psint_t) line, \ | 413 | /* 2 */ (void *)(__psint_t) line, \ |
| 414 | /* 3 */ (void *)(vn_count(vp)), \ | 414 | /* 3 */ (void *)(__psint_t)(vn_count(vp)), \ |
| 415 | /* 4 */ (void *)(ra), \ | 415 | /* 4 */ (void *)(ra), \ |
| 416 | /* 5 */ (void *)(__psunsigned_t)(vp)->v_flag, \ | 416 | /* 5 */ (void *)(__psunsigned_t)(vp)->v_flag, \ |
| 417 | /* 6 */ (void *)(__psint_t)current_cpu(), \ | 417 | /* 6 */ (void *)(__psint_t)current_cpu(), \ |
| 418 | /* 7 */ (void *)(__psint_t)current_pid(), \ | 418 | /* 7 */ (void *)(__psint_t)current_pid(), \ |
| 419 | /* 8 */ (void *)__return_address, \ | 419 | /* 8 */ (void *)__return_address, \ |
| 420 | /* 9 */ 0, 0, 0, 0, 0, 0, 0) | 420 | /* 9 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL) |
| 421 | 421 | ||
| 422 | /* | 422 | /* |
| 423 | * Vnode tracing code. | 423 | * Vnode tracing code. |