Skip to content

Commit 578c714

Browse files
author
Darrick J. Wong
committed
xfs: fix confusing xfs_extent_item variable names
Change the name of all pointers to xfs_extent_item structures to "xefi" to make the name consistent and because the current selections ("new" and "free") mean other things in C. Signed-off-by: Darrick J. Wong <[email protected]>
1 parent 72ba455 commit 578c714

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed

‎fs/xfs/libxfs/xfs_alloc.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,20 +2472,20 @@ xfs_defer_agfl_block(
24722472
struct xfs_owner_info *oinfo)
24732473
{
24742474
struct xfs_mount *mp = tp->t_mountp;
2475-
struct xfs_extent_free_item *new; /* new element */
2475+
struct xfs_extent_free_item *xefi;
24762476

24772477
ASSERT(xfs_extfree_item_cache != NULL);
24782478
ASSERT(oinfo != NULL);
24792479

2480-
new = kmem_cache_zalloc(xfs_extfree_item_cache,
2480+
xefi = kmem_cache_zalloc(xfs_extfree_item_cache,
24812481
GFP_KERNEL | __GFP_NOFAIL);
2482-
new->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);
2483-
new->xefi_blockcount = 1;
2484-
new->xefi_owner = oinfo->oi_owner;
2482+
xefi->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);
2483+
xefi->xefi_blockcount = 1;
2484+
xefi->xefi_owner = oinfo->oi_owner;
24852485

24862486
trace_xfs_agfl_free_defer(mp, agno, 0, agbno, 1);
24872487

2488-
xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &new->xefi_list);
2488+
xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &xefi->xefi_list);
24892489
}
24902490

24912491
/*
@@ -2500,7 +2500,7 @@ __xfs_free_extent_later(
25002500
const struct xfs_owner_info *oinfo,
25012501
bool skip_discard)
25022502
{
2503-
struct xfs_extent_free_item *new; /* new element */
2503+
struct xfs_extent_free_item *xefi;
25042504
#ifdef DEBUG
25052505
struct xfs_mount *mp = tp->t_mountp;
25062506
xfs_agnumber_t agno;
@@ -2519,27 +2519,27 @@ __xfs_free_extent_later(
25192519
#endif
25202520
ASSERT(xfs_extfree_item_cache != NULL);
25212521

2522-
new = kmem_cache_zalloc(xfs_extfree_item_cache,
2522+
xefi = kmem_cache_zalloc(xfs_extfree_item_cache,
25232523
GFP_KERNEL | __GFP_NOFAIL);
2524-
new->xefi_startblock = bno;
2525-
new->xefi_blockcount = (xfs_extlen_t)len;
2524+
xefi->xefi_startblock = bno;
2525+
xefi->xefi_blockcount = (xfs_extlen_t)len;
25262526
if (skip_discard)
2527-
new->xefi_flags |= XFS_EFI_SKIP_DISCARD;
2527+
xefi->xefi_flags |= XFS_EFI_SKIP_DISCARD;
25282528
if (oinfo) {
25292529
ASSERT(oinfo->oi_offset == 0);
25302530

25312531
if (oinfo->oi_flags & XFS_OWNER_INFO_ATTR_FORK)
2532-
new->xefi_flags |= XFS_EFI_ATTR_FORK;
2532+
xefi->xefi_flags |= XFS_EFI_ATTR_FORK;
25332533
if (oinfo->oi_flags & XFS_OWNER_INFO_BMBT_BLOCK)
2534-
new->xefi_flags |= XFS_EFI_BMBT_BLOCK;
2535-
new->xefi_owner = oinfo->oi_owner;
2534+
xefi->xefi_flags |= XFS_EFI_BMBT_BLOCK;
2535+
xefi->xefi_owner = oinfo->oi_owner;
25362536
} else {
2537-
new->xefi_owner = XFS_RMAP_OWN_NULL;
2537+
xefi->xefi_owner = XFS_RMAP_OWN_NULL;
25382538
}
25392539
trace_xfs_bmap_free_defer(tp->t_mountp,
25402540
XFS_FSB_TO_AGNO(tp->t_mountp, bno), 0,
25412541
XFS_FSB_TO_AGBNO(tp->t_mountp, bno), len);
2542-
xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &new->xefi_list);
2542+
xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &xefi->xefi_list);
25432543
}
25442544

25452545
#ifdef DEBUG

‎fs/xfs/xfs_extfree_item.c

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -345,30 +345,30 @@ static int
345345
xfs_trans_free_extent(
346346
struct xfs_trans *tp,
347347
struct xfs_efd_log_item *efdp,
348-
struct xfs_extent_free_item *free)
348+
struct xfs_extent_free_item *xefi)
349349
{
350350
struct xfs_owner_info oinfo = { };
351351
struct xfs_mount *mp = tp->t_mountp;
352352
struct xfs_extent *extp;
353353
uint next_extent;
354354
xfs_agnumber_t agno = XFS_FSB_TO_AGNO(mp,
355-
free->xefi_startblock);
355+
xefi->xefi_startblock);
356356
xfs_agblock_t agbno = XFS_FSB_TO_AGBNO(mp,
357-
free->xefi_startblock);
357+
xefi->xefi_startblock);
358358
int error;
359359

360-
oinfo.oi_owner = free->xefi_owner;
361-
if (free->xefi_flags & XFS_EFI_ATTR_FORK)
360+
oinfo.oi_owner = xefi->xefi_owner;
361+
if (xefi->xefi_flags & XFS_EFI_ATTR_FORK)
362362
oinfo.oi_flags |= XFS_OWNER_INFO_ATTR_FORK;
363-
if (free->xefi_flags & XFS_EFI_BMBT_BLOCK)
363+
if (xefi->xefi_flags & XFS_EFI_BMBT_BLOCK)
364364
oinfo.oi_flags |= XFS_OWNER_INFO_BMBT_BLOCK;
365365

366366
trace_xfs_bmap_free_deferred(tp->t_mountp, agno, 0, agbno,
367-
free->xefi_blockcount);
367+
xefi->xefi_blockcount);
368368

369-
error = __xfs_free_extent(tp, free->xefi_startblock,
370-
free->xefi_blockcount, &oinfo, XFS_AG_RESV_NONE,
371-
free->xefi_flags & XFS_EFI_SKIP_DISCARD);
369+
error = __xfs_free_extent(tp, xefi->xefi_startblock,
370+
xefi->xefi_blockcount, &oinfo, XFS_AG_RESV_NONE,
371+
xefi->xefi_flags & XFS_EFI_SKIP_DISCARD);
372372
/*
373373
* Mark the transaction dirty, even on error. This ensures the
374374
* transaction is aborted, which:
@@ -382,8 +382,8 @@ xfs_trans_free_extent(
382382
next_extent = efdp->efd_next_extent;
383383
ASSERT(next_extent < efdp->efd_format.efd_nextents);
384384
extp = &(efdp->efd_format.efd_extents[next_extent]);
385-
extp->ext_start = free->xefi_startblock;
386-
extp->ext_len = free->xefi_blockcount;
385+
extp->ext_start = xefi->xefi_startblock;
386+
extp->ext_len = xefi->xefi_blockcount;
387387
efdp->efd_next_extent++;
388388

389389
return error;
@@ -411,7 +411,7 @@ STATIC void
411411
xfs_extent_free_log_item(
412412
struct xfs_trans *tp,
413413
struct xfs_efi_log_item *efip,
414-
struct xfs_extent_free_item *free)
414+
struct xfs_extent_free_item *xefi)
415415
{
416416
uint next_extent;
417417
struct xfs_extent *extp;
@@ -427,8 +427,8 @@ xfs_extent_free_log_item(
427427
next_extent = atomic_inc_return(&efip->efi_next_extent) - 1;
428428
ASSERT(next_extent < efip->efi_format.efi_nextents);
429429
extp = &efip->efi_format.efi_extents[next_extent];
430-
extp->ext_start = free->xefi_startblock;
431-
extp->ext_len = free->xefi_blockcount;
430+
extp->ext_start = xefi->xefi_startblock;
431+
extp->ext_len = xefi->xefi_blockcount;
432432
}
433433

434434
static struct xfs_log_item *
@@ -440,15 +440,15 @@ xfs_extent_free_create_intent(
440440
{
441441
struct xfs_mount *mp = tp->t_mountp;
442442
struct xfs_efi_log_item *efip = xfs_efi_init(mp, count);
443-
struct xfs_extent_free_item *free;
443+
struct xfs_extent_free_item *xefi;
444444

445445
ASSERT(count > 0);
446446

447447
xfs_trans_add_item(tp, &efip->efi_item);
448448
if (sort)
449449
list_sort(mp, items, xfs_extent_free_diff_items);
450-
list_for_each_entry(free, items, xefi_list)
451-
xfs_extent_free_log_item(tp, efip, free);
450+
list_for_each_entry(xefi, items, xefi_list)
451+
xfs_extent_free_log_item(tp, efip, xefi);
452452
return &efip->efi_item;
453453
}
454454

@@ -470,13 +470,13 @@ xfs_extent_free_finish_item(
470470
struct list_head *item,
471471
struct xfs_btree_cur **state)
472472
{
473-
struct xfs_extent_free_item *free;
473+
struct xfs_extent_free_item *xefi;
474474
int error;
475475

476-
free = container_of(item, struct xfs_extent_free_item, xefi_list);
476+
xefi = container_of(item, struct xfs_extent_free_item, xefi_list);
477477

478-
error = xfs_trans_free_extent(tp, EFD_ITEM(done), free);
479-
kmem_cache_free(xfs_extfree_item_cache, free);
478+
error = xfs_trans_free_extent(tp, EFD_ITEM(done), xefi);
479+
kmem_cache_free(xfs_extfree_item_cache, xefi);
480480
return error;
481481
}
482482

@@ -493,10 +493,10 @@ STATIC void
493493
xfs_extent_free_cancel_item(
494494
struct list_head *item)
495495
{
496-
struct xfs_extent_free_item *free;
496+
struct xfs_extent_free_item *xefi;
497497

498-
free = container_of(item, struct xfs_extent_free_item, xefi_list);
499-
kmem_cache_free(xfs_extfree_item_cache, free);
498+
xefi = container_of(item, struct xfs_extent_free_item, xefi_list);
499+
kmem_cache_free(xfs_extfree_item_cache, xefi);
500500
}
501501

502502
const struct xfs_defer_op_type xfs_extent_free_defer_type = {
@@ -522,7 +522,7 @@ xfs_agfl_free_finish_item(
522522
struct xfs_owner_info oinfo = { };
523523
struct xfs_mount *mp = tp->t_mountp;
524524
struct xfs_efd_log_item *efdp = EFD_ITEM(done);
525-
struct xfs_extent_free_item *free;
525+
struct xfs_extent_free_item *xefi;
526526
struct xfs_extent *extp;
527527
struct xfs_buf *agbp;
528528
int error;
@@ -531,13 +531,13 @@ xfs_agfl_free_finish_item(
531531
uint next_extent;
532532
struct xfs_perag *pag;
533533

534-
free = container_of(item, struct xfs_extent_free_item, xefi_list);
535-
ASSERT(free->xefi_blockcount == 1);
536-
agno = XFS_FSB_TO_AGNO(mp, free->xefi_startblock);
537-
agbno = XFS_FSB_TO_AGBNO(mp, free->xefi_startblock);
538-
oinfo.oi_owner = free->xefi_owner;
534+
xefi = container_of(item, struct xfs_extent_free_item, xefi_list);
535+
ASSERT(xefi->xefi_blockcount == 1);
536+
agno = XFS_FSB_TO_AGNO(mp, xefi->xefi_startblock);
537+
agbno = XFS_FSB_TO_AGBNO(mp, xefi->xefi_startblock);
538+
oinfo.oi_owner = xefi->xefi_owner;
539539

540-
trace_xfs_agfl_free_deferred(mp, agno, 0, agbno, free->xefi_blockcount);
540+
trace_xfs_agfl_free_deferred(mp, agno, 0, agbno, xefi->xefi_blockcount);
541541

542542
pag = xfs_perag_get(mp, agno);
543543
error = xfs_alloc_read_agf(pag, tp, 0, &agbp);
@@ -558,11 +558,11 @@ xfs_agfl_free_finish_item(
558558
next_extent = efdp->efd_next_extent;
559559
ASSERT(next_extent < efdp->efd_format.efd_nextents);
560560
extp = &(efdp->efd_format.efd_extents[next_extent]);
561-
extp->ext_start = free->xefi_startblock;
562-
extp->ext_len = free->xefi_blockcount;
561+
extp->ext_start = xefi->xefi_startblock;
562+
extp->ext_len = xefi->xefi_blockcount;
563563
efdp->efd_next_extent++;
564564

565-
kmem_cache_free(xfs_extfree_item_cache, free);
565+
kmem_cache_free(xfs_extfree_item_cache, xefi);
566566
return error;
567567
}
568568

0 commit comments

Comments
 (0)