diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-01-19 04:56:45 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-01-21 14:44:43 -0500 |
commit | 4139b3b337cffd106744386c842b89dc86e31d4b (patch) | |
tree | 13e98549e956cabcaf88dd3218268ae643802c78 /fs/xfs/xfs_inode_item.c | |
parent | 0cadda1c5f194f98a05d252ff4385d86d2ed0862 (diff) |
xfs: kill XLOG_VEC_SET_TYPE
This macro only obsfucates the log item type assignments, so kill it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_inode_item.c')
-rw-r--r-- | fs/xfs/xfs_inode_item.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 6194fb5d3777..da4cac67bdae 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c | |||
@@ -228,7 +228,7 @@ xfs_inode_item_format( | |||
228 | 228 | ||
229 | vecp->i_addr = (xfs_caddr_t)&iip->ili_format; | 229 | vecp->i_addr = (xfs_caddr_t)&iip->ili_format; |
230 | vecp->i_len = sizeof(xfs_inode_log_format_t); | 230 | vecp->i_len = sizeof(xfs_inode_log_format_t); |
231 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IFORMAT); | 231 | vecp->i_type = XLOG_REG_TYPE_IFORMAT; |
232 | vecp++; | 232 | vecp++; |
233 | nvecs = 1; | 233 | nvecs = 1; |
234 | 234 | ||
@@ -279,7 +279,7 @@ xfs_inode_item_format( | |||
279 | 279 | ||
280 | vecp->i_addr = (xfs_caddr_t)&ip->i_d; | 280 | vecp->i_addr = (xfs_caddr_t)&ip->i_d; |
281 | vecp->i_len = sizeof(struct xfs_icdinode); | 281 | vecp->i_len = sizeof(struct xfs_icdinode); |
282 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_ICORE); | 282 | vecp->i_type = XLOG_REG_TYPE_ICORE; |
283 | vecp++; | 283 | vecp++; |
284 | nvecs++; | 284 | nvecs++; |
285 | iip->ili_format.ilf_fields |= XFS_ILOG_CORE; | 285 | iip->ili_format.ilf_fields |= XFS_ILOG_CORE; |
@@ -336,7 +336,7 @@ xfs_inode_item_format( | |||
336 | vecp->i_addr = | 336 | vecp->i_addr = |
337 | (char *)(ip->i_df.if_u1.if_extents); | 337 | (char *)(ip->i_df.if_u1.if_extents); |
338 | vecp->i_len = ip->i_df.if_bytes; | 338 | vecp->i_len = ip->i_df.if_bytes; |
339 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IEXT); | 339 | vecp->i_type = XLOG_REG_TYPE_IEXT; |
340 | } else | 340 | } else |
341 | #endif | 341 | #endif |
342 | { | 342 | { |
@@ -355,7 +355,7 @@ xfs_inode_item_format( | |||
355 | vecp->i_addr = (xfs_caddr_t)ext_buffer; | 355 | vecp->i_addr = (xfs_caddr_t)ext_buffer; |
356 | vecp->i_len = xfs_iextents_copy(ip, ext_buffer, | 356 | vecp->i_len = xfs_iextents_copy(ip, ext_buffer, |
357 | XFS_DATA_FORK); | 357 | XFS_DATA_FORK); |
358 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IEXT); | 358 | vecp->i_type = XLOG_REG_TYPE_IEXT; |
359 | } | 359 | } |
360 | ASSERT(vecp->i_len <= ip->i_df.if_bytes); | 360 | ASSERT(vecp->i_len <= ip->i_df.if_bytes); |
361 | iip->ili_format.ilf_dsize = vecp->i_len; | 361 | iip->ili_format.ilf_dsize = vecp->i_len; |
@@ -373,7 +373,7 @@ xfs_inode_item_format( | |||
373 | ASSERT(ip->i_df.if_broot != NULL); | 373 | ASSERT(ip->i_df.if_broot != NULL); |
374 | vecp->i_addr = (xfs_caddr_t)ip->i_df.if_broot; | 374 | vecp->i_addr = (xfs_caddr_t)ip->i_df.if_broot; |
375 | vecp->i_len = ip->i_df.if_broot_bytes; | 375 | vecp->i_len = ip->i_df.if_broot_bytes; |
376 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IBROOT); | 376 | vecp->i_type = XLOG_REG_TYPE_IBROOT; |
377 | vecp++; | 377 | vecp++; |
378 | nvecs++; | 378 | nvecs++; |
379 | iip->ili_format.ilf_dsize = ip->i_df.if_broot_bytes; | 379 | iip->ili_format.ilf_dsize = ip->i_df.if_broot_bytes; |
@@ -399,7 +399,7 @@ xfs_inode_item_format( | |||
399 | ASSERT((ip->i_df.if_real_bytes == 0) || | 399 | ASSERT((ip->i_df.if_real_bytes == 0) || |
400 | (ip->i_df.if_real_bytes == data_bytes)); | 400 | (ip->i_df.if_real_bytes == data_bytes)); |
401 | vecp->i_len = (int)data_bytes; | 401 | vecp->i_len = (int)data_bytes; |
402 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_ILOCAL); | 402 | vecp->i_type = XLOG_REG_TYPE_ILOCAL; |
403 | vecp++; | 403 | vecp++; |
404 | nvecs++; | 404 | nvecs++; |
405 | iip->ili_format.ilf_dsize = (unsigned)data_bytes; | 405 | iip->ili_format.ilf_dsize = (unsigned)data_bytes; |
@@ -477,7 +477,7 @@ xfs_inode_item_format( | |||
477 | vecp->i_len = xfs_iextents_copy(ip, ext_buffer, | 477 | vecp->i_len = xfs_iextents_copy(ip, ext_buffer, |
478 | XFS_ATTR_FORK); | 478 | XFS_ATTR_FORK); |
479 | #endif | 479 | #endif |
480 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IATTR_EXT); | 480 | vecp->i_type = XLOG_REG_TYPE_IATTR_EXT; |
481 | iip->ili_format.ilf_asize = vecp->i_len; | 481 | iip->ili_format.ilf_asize = vecp->i_len; |
482 | vecp++; | 482 | vecp++; |
483 | nvecs++; | 483 | nvecs++; |
@@ -492,7 +492,7 @@ xfs_inode_item_format( | |||
492 | ASSERT(ip->i_afp->if_broot != NULL); | 492 | ASSERT(ip->i_afp->if_broot != NULL); |
493 | vecp->i_addr = (xfs_caddr_t)ip->i_afp->if_broot; | 493 | vecp->i_addr = (xfs_caddr_t)ip->i_afp->if_broot; |
494 | vecp->i_len = ip->i_afp->if_broot_bytes; | 494 | vecp->i_len = ip->i_afp->if_broot_bytes; |
495 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IATTR_BROOT); | 495 | vecp->i_type = XLOG_REG_TYPE_IATTR_BROOT; |
496 | vecp++; | 496 | vecp++; |
497 | nvecs++; | 497 | nvecs++; |
498 | iip->ili_format.ilf_asize = ip->i_afp->if_broot_bytes; | 498 | iip->ili_format.ilf_asize = ip->i_afp->if_broot_bytes; |
@@ -516,7 +516,7 @@ xfs_inode_item_format( | |||
516 | ASSERT((ip->i_afp->if_real_bytes == 0) || | 516 | ASSERT((ip->i_afp->if_real_bytes == 0) || |
517 | (ip->i_afp->if_real_bytes == data_bytes)); | 517 | (ip->i_afp->if_real_bytes == data_bytes)); |
518 | vecp->i_len = (int)data_bytes; | 518 | vecp->i_len = (int)data_bytes; |
519 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IATTR_LOCAL); | 519 | vecp->i_type = XLOG_REG_TYPE_IATTR_LOCAL; |
520 | vecp++; | 520 | vecp++; |
521 | nvecs++; | 521 | nvecs++; |
522 | iip->ili_format.ilf_asize = (unsigned)data_bytes; | 522 | iip->ili_format.ilf_asize = (unsigned)data_bytes; |