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 | |
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>
-rw-r--r-- | fs/xfs/quota/xfs_dquot_item.c | 6 | ||||
-rw-r--r-- | fs/xfs/xfs_buf_item.c | 8 | ||||
-rw-r--r-- | fs/xfs/xfs_extfree_item.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_inode_item.c | 18 | ||||
-rw-r--r-- | fs/xfs/xfs_log.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_log.h | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_trans.c | 2 |
7 files changed, 22 insertions, 24 deletions
diff --git a/fs/xfs/quota/xfs_dquot_item.c b/fs/xfs/quota/xfs_dquot_item.c index 37929d19ef44..116580d52fae 100644 --- a/fs/xfs/quota/xfs_dquot_item.c +++ b/fs/xfs/quota/xfs_dquot_item.c | |||
@@ -74,11 +74,11 @@ xfs_qm_dquot_logitem_format( | |||
74 | 74 | ||
75 | logvec->i_addr = (xfs_caddr_t)&logitem->qli_format; | 75 | logvec->i_addr = (xfs_caddr_t)&logitem->qli_format; |
76 | logvec->i_len = sizeof(xfs_dq_logformat_t); | 76 | logvec->i_len = sizeof(xfs_dq_logformat_t); |
77 | XLOG_VEC_SET_TYPE(logvec, XLOG_REG_TYPE_QFORMAT); | 77 | logvec->i_type = XLOG_REG_TYPE_QFORMAT; |
78 | logvec++; | 78 | logvec++; |
79 | logvec->i_addr = (xfs_caddr_t)&logitem->qli_dquot->q_core; | 79 | logvec->i_addr = (xfs_caddr_t)&logitem->qli_dquot->q_core; |
80 | logvec->i_len = sizeof(xfs_disk_dquot_t); | 80 | logvec->i_len = sizeof(xfs_disk_dquot_t); |
81 | XLOG_VEC_SET_TYPE(logvec, XLOG_REG_TYPE_DQUOT); | 81 | logvec->i_type = XLOG_REG_TYPE_DQUOT; |
82 | 82 | ||
83 | ASSERT(2 == logitem->qli_item.li_desc->lid_size); | 83 | ASSERT(2 == logitem->qli_item.li_desc->lid_size); |
84 | logitem->qli_format.qlf_size = 2; | 84 | logitem->qli_format.qlf_size = 2; |
@@ -466,7 +466,7 @@ xfs_qm_qoff_logitem_format(xfs_qoff_logitem_t *qf, | |||
466 | 466 | ||
467 | log_vector->i_addr = (xfs_caddr_t)&(qf->qql_format); | 467 | log_vector->i_addr = (xfs_caddr_t)&(qf->qql_format); |
468 | log_vector->i_len = sizeof(xfs_qoff_logitem_t); | 468 | log_vector->i_len = sizeof(xfs_qoff_logitem_t); |
469 | XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_QUOTAOFF); | 469 | log_vector->i_type = XLOG_REG_TYPE_QUOTAOFF; |
470 | qf->qql_format.qf_size = 1; | 470 | qf->qql_format.qf_size = 1; |
471 | } | 471 | } |
472 | 472 | ||
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index a30f7e9eb2b9..e0a11583ce5a 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
@@ -250,7 +250,7 @@ xfs_buf_item_format( | |||
250 | ((bip->bli_format.blf_map_size - 1) * sizeof(uint))); | 250 | ((bip->bli_format.blf_map_size - 1) * sizeof(uint))); |
251 | vecp->i_addr = (xfs_caddr_t)&bip->bli_format; | 251 | vecp->i_addr = (xfs_caddr_t)&bip->bli_format; |
252 | vecp->i_len = base_size; | 252 | vecp->i_len = base_size; |
253 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BFORMAT); | 253 | vecp->i_type = XLOG_REG_TYPE_BFORMAT; |
254 | vecp++; | 254 | vecp++; |
255 | nvecs = 1; | 255 | nvecs = 1; |
256 | 256 | ||
@@ -297,14 +297,14 @@ xfs_buf_item_format( | |||
297 | buffer_offset = first_bit * XFS_BLI_CHUNK; | 297 | buffer_offset = first_bit * XFS_BLI_CHUNK; |
298 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); | 298 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); |
299 | vecp->i_len = nbits * XFS_BLI_CHUNK; | 299 | vecp->i_len = nbits * XFS_BLI_CHUNK; |
300 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BCHUNK); | 300 | vecp->i_type = XLOG_REG_TYPE_BCHUNK; |
301 | nvecs++; | 301 | nvecs++; |
302 | break; | 302 | break; |
303 | } else if (next_bit != last_bit + 1) { | 303 | } else if (next_bit != last_bit + 1) { |
304 | buffer_offset = first_bit * XFS_BLI_CHUNK; | 304 | buffer_offset = first_bit * XFS_BLI_CHUNK; |
305 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); | 305 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); |
306 | vecp->i_len = nbits * XFS_BLI_CHUNK; | 306 | vecp->i_len = nbits * XFS_BLI_CHUNK; |
307 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BCHUNK); | 307 | vecp->i_type = XLOG_REG_TYPE_BCHUNK; |
308 | nvecs++; | 308 | nvecs++; |
309 | vecp++; | 309 | vecp++; |
310 | first_bit = next_bit; | 310 | first_bit = next_bit; |
@@ -316,7 +316,7 @@ xfs_buf_item_format( | |||
316 | buffer_offset = first_bit * XFS_BLI_CHUNK; | 316 | buffer_offset = first_bit * XFS_BLI_CHUNK; |
317 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); | 317 | vecp->i_addr = xfs_buf_offset(bp, buffer_offset); |
318 | vecp->i_len = nbits * XFS_BLI_CHUNK; | 318 | vecp->i_len = nbits * XFS_BLI_CHUNK; |
319 | XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BCHUNK); | 319 | vecp->i_type = XLOG_REG_TYPE_BCHUNK; |
320 | /* You would think we need to bump the nvecs here too, but we do not | 320 | /* You would think we need to bump the nvecs here too, but we do not |
321 | * this number is used by recovery, and it gets confused by the boundary | 321 | * this number is used by recovery, and it gets confused by the boundary |
322 | * split here | 322 | * split here |
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c index 05a4bdd4be39..6f35ed1b39b9 100644 --- a/fs/xfs/xfs_extfree_item.c +++ b/fs/xfs/xfs_extfree_item.c | |||
@@ -82,7 +82,7 @@ xfs_efi_item_format(xfs_efi_log_item_t *efip, | |||
82 | 82 | ||
83 | log_vector->i_addr = (xfs_caddr_t)&(efip->efi_format); | 83 | log_vector->i_addr = (xfs_caddr_t)&(efip->efi_format); |
84 | log_vector->i_len = size; | 84 | log_vector->i_len = size; |
85 | XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_EFI_FORMAT); | 85 | log_vector->i_type = XLOG_REG_TYPE_EFI_FORMAT; |
86 | ASSERT(size >= sizeof(xfs_efi_log_format_t)); | 86 | ASSERT(size >= sizeof(xfs_efi_log_format_t)); |
87 | } | 87 | } |
88 | 88 | ||
@@ -406,7 +406,7 @@ xfs_efd_item_format(xfs_efd_log_item_t *efdp, | |||
406 | 406 | ||
407 | log_vector->i_addr = (xfs_caddr_t)&(efdp->efd_format); | 407 | log_vector->i_addr = (xfs_caddr_t)&(efdp->efd_format); |
408 | log_vector->i_len = size; | 408 | log_vector->i_len = size; |
409 | XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_EFD_FORMAT); | 409 | log_vector->i_type = XLOG_REG_TYPE_EFD_FORMAT; |
410 | ASSERT(size >= sizeof(xfs_efd_log_format_t)); | 410 | ASSERT(size >= sizeof(xfs_efd_log_format_t)); |
411 | } | 411 | } |
412 | 412 | ||
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; |
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 0d17516fbb13..20118ddadef6 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -617,7 +617,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) | |||
617 | if (! (XLOG_FORCED_SHUTDOWN(log))) { | 617 | if (! (XLOG_FORCED_SHUTDOWN(log))) { |
618 | reg[0].i_addr = (void*)&magic; | 618 | reg[0].i_addr = (void*)&magic; |
619 | reg[0].i_len = sizeof(magic); | 619 | reg[0].i_len = sizeof(magic); |
620 | XLOG_VEC_SET_TYPE(®[0], XLOG_REG_TYPE_UNMOUNT); | 620 | reg[0].i_type = XLOG_REG_TYPE_UNMOUNT; |
621 | 621 | ||
622 | error = xfs_log_reserve(mp, 600, 1, &tic, | 622 | error = xfs_log_reserve(mp, 600, 1, &tic, |
623 | XFS_LOG, 0, XLOG_UNMOUNT_REC_TYPE); | 623 | XFS_LOG, 0, XLOG_UNMOUNT_REC_TYPE); |
@@ -1236,7 +1236,7 @@ xlog_commit_record(xfs_mount_t *mp, | |||
1236 | 1236 | ||
1237 | reg[0].i_addr = NULL; | 1237 | reg[0].i_addr = NULL; |
1238 | reg[0].i_len = 0; | 1238 | reg[0].i_len = 0; |
1239 | XLOG_VEC_SET_TYPE(®[0], XLOG_REG_TYPE_COMMIT); | 1239 | reg[0].i_type = XLOG_REG_TYPE_COMMIT; |
1240 | 1240 | ||
1241 | ASSERT_ALWAYS(iclog); | 1241 | ASSERT_ALWAYS(iclog); |
1242 | if ((error = xlog_write(mp, reg, 1, ticket, commitlsnp, | 1242 | if ((error = xlog_write(mp, reg, 1, ticket, commitlsnp, |
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index d0c9baa50b1a..811ccf4d8b3e 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h | |||
@@ -110,10 +110,8 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) | |||
110 | #define XLOG_REG_TYPE_TRANSHDR 19 | 110 | #define XLOG_REG_TYPE_TRANSHDR 19 |
111 | #define XLOG_REG_TYPE_MAX 19 | 111 | #define XLOG_REG_TYPE_MAX 19 |
112 | 112 | ||
113 | #define XLOG_VEC_SET_TYPE(vecp, t) ((vecp)->i_type = (t)) | ||
114 | |||
115 | typedef struct xfs_log_iovec { | 113 | typedef struct xfs_log_iovec { |
116 | xfs_caddr_t i_addr; /* beginning address of region */ | 114 | xfs_caddr_t i_addr; /* beginning address of region */ |
117 | int i_len; /* length in bytes of region */ | 115 | int i_len; /* length in bytes of region */ |
118 | uint i_type; /* type of region */ | 116 | uint i_type; /* type of region */ |
119 | } xfs_log_iovec_t; | 117 | } xfs_log_iovec_t; |
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 237badcbac3b..7dbe3c3051db 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
@@ -1121,7 +1121,7 @@ xfs_trans_fill_vecs( | |||
1121 | tp->t_header.th_num_items = nitems; | 1121 | tp->t_header.th_num_items = nitems; |
1122 | log_vector->i_addr = (xfs_caddr_t)&tp->t_header; | 1122 | log_vector->i_addr = (xfs_caddr_t)&tp->t_header; |
1123 | log_vector->i_len = sizeof(xfs_trans_header_t); | 1123 | log_vector->i_len = sizeof(xfs_trans_header_t); |
1124 | XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_TRANSHDR); | 1124 | log_vector->i_type = XLOG_REG_TYPE_TRANSHDR; |
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | 1127 | ||