@@ -173,7 +173,7 @@ xfs_rtfind_back(
173
173
* Compute match value, based on the bit at start: if 1 (free)
174
174
* then all-ones, else all-zeroes.
175
175
*/
176
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
176
+ incore = xfs_rtbitmap_getword (args , word );
177
177
want = (incore & ((xfs_rtword_t )1 << bit )) ? -1 : 0 ;
178
178
/*
179
179
* If the starting position is not word-aligned, deal with the
@@ -228,7 +228,7 @@ xfs_rtfind_back(
228
228
/*
229
229
* Compute difference between actual and desired value.
230
230
*/
231
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
231
+ incore = xfs_rtbitmap_getword (args , word );
232
232
if ((wdiff = incore ^ want )) {
233
233
/*
234
234
* Different, mark where we are and return.
@@ -267,7 +267,7 @@ xfs_rtfind_back(
267
267
/*
268
268
* Compute difference between actual and desired value.
269
269
*/
270
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
270
+ incore = xfs_rtbitmap_getword (args , word );
271
271
if ((wdiff = (incore ^ want ) & mask )) {
272
272
/*
273
273
* Different, mark where we are and return.
@@ -327,7 +327,7 @@ xfs_rtfind_forw(
327
327
* Compute match value, based on the bit at start: if 1 (free)
328
328
* then all-ones, else all-zeroes.
329
329
*/
330
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
330
+ incore = xfs_rtbitmap_getword (args , word );
331
331
want = (incore & ((xfs_rtword_t )1 << bit )) ? -1 : 0 ;
332
332
/*
333
333
* If the starting position is not word-aligned, deal with the
@@ -381,7 +381,7 @@ xfs_rtfind_forw(
381
381
/*
382
382
* Compute difference between actual and desired value.
383
383
*/
384
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
384
+ incore = xfs_rtbitmap_getword (args , word );
385
385
if ((wdiff = incore ^ want )) {
386
386
/*
387
387
* Different, mark where we are and return.
@@ -418,7 +418,7 @@ xfs_rtfind_forw(
418
418
/*
419
419
* Compute difference between actual and desired value.
420
420
*/
421
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
421
+ incore = xfs_rtbitmap_getword (args , word );
422
422
if ((wdiff = (incore ^ want ) & mask )) {
423
423
/*
424
424
* Different, mark where we are and return.
@@ -439,16 +439,16 @@ xfs_rtfind_forw(
439
439
/* Log rtsummary counter at @infoword. */
440
440
static inline void
441
441
xfs_trans_log_rtsummary (
442
- struct xfs_trans * tp ,
443
- struct xfs_buf * bp ,
442
+ struct xfs_rtalloc_args * args ,
444
443
unsigned int infoword )
445
444
{
445
+ struct xfs_buf * bp = args -> sumbp ;
446
446
size_t first , last ;
447
447
448
- first = (void * )xfs_rsumblock_infoptr (bp , infoword ) - bp -> b_addr ;
448
+ first = (void * )xfs_rsumblock_infoptr (args , infoword ) - bp -> b_addr ;
449
449
last = first + sizeof (xfs_suminfo_t ) - 1 ;
450
450
451
- xfs_trans_log_buf (tp , bp , first , last );
451
+ xfs_trans_log_buf (args -> tp , bp , first , last );
452
452
}
453
453
454
454
/*
@@ -492,20 +492,19 @@ xfs_rtmodify_summary_int(
492
492
*/
493
493
infoword = xfs_rtsumoffs_to_infoword (mp , so );
494
494
if (delta ) {
495
- xfs_suminfo_t val = xfs_suminfo_add (args -> sumbp , infoword ,
496
- delta );
495
+ xfs_suminfo_t val = xfs_suminfo_add (args , infoword , delta );
497
496
498
497
if (mp -> m_rsum_cache ) {
499
498
if (val == 0 && log == mp -> m_rsum_cache [bbno ])
500
499
mp -> m_rsum_cache [bbno ]++ ;
501
500
if (val != 0 && log < mp -> m_rsum_cache [bbno ])
502
501
mp -> m_rsum_cache [bbno ] = log ;
503
502
}
504
- xfs_trans_log_rtsummary (args -> tp , args -> sumbp , infoword );
503
+ xfs_trans_log_rtsummary (args , infoword );
505
504
if (sum )
506
505
* sum = val ;
507
506
} else if (sum ) {
508
- * sum = xfs_suminfo_get (args -> sumbp , infoword );
507
+ * sum = xfs_suminfo_get (args , infoword );
509
508
}
510
509
return 0 ;
511
510
}
@@ -523,17 +522,17 @@ xfs_rtmodify_summary(
523
522
/* Log rtbitmap block from the word @from to the byte before @next. */
524
523
static inline void
525
524
xfs_trans_log_rtbitmap (
526
- struct xfs_trans * tp ,
527
- struct xfs_buf * bp ,
525
+ struct xfs_rtalloc_args * args ,
528
526
unsigned int from ,
529
527
unsigned int next )
530
528
{
529
+ struct xfs_buf * bp = args -> rbmbp ;
531
530
size_t first , last ;
532
531
533
- first = (void * )xfs_rbmblock_wordptr (bp , from ) - bp -> b_addr ;
534
- last = ((void * )xfs_rbmblock_wordptr (bp , next ) - 1 ) - bp -> b_addr ;
532
+ first = (void * )xfs_rbmblock_wordptr (args , from ) - bp -> b_addr ;
533
+ last = ((void * )xfs_rbmblock_wordptr (args , next ) - 1 ) - bp -> b_addr ;
535
534
536
- xfs_trans_log_buf (tp , bp , first , last );
535
+ xfs_trans_log_buf (args -> tp , bp , first , last );
537
536
}
538
537
539
538
/*
@@ -591,12 +590,12 @@ xfs_rtmodify_range(
591
590
/*
592
591
* Set/clear the active bits.
593
592
*/
594
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
593
+ incore = xfs_rtbitmap_getword (args , word );
595
594
if (val )
596
595
incore |= mask ;
597
596
else
598
597
incore &= ~mask ;
599
- xfs_rtbitmap_setword (args -> rbmbp , word , incore );
598
+ xfs_rtbitmap_setword (args , word , incore );
600
599
i = lastbit - bit ;
601
600
/*
602
601
* Go on to the next block if that's where the next word is
@@ -607,8 +606,7 @@ xfs_rtmodify_range(
607
606
* Log the changed part of this block.
608
607
* Get the next one.
609
608
*/
610
- xfs_trans_log_rtbitmap (args -> tp , args -> rbmbp , firstword ,
611
- word );
609
+ xfs_trans_log_rtbitmap (args , firstword , word );
612
610
error = xfs_rtbitmap_read_buf (args , ++ block );
613
611
if (error )
614
612
return error ;
@@ -629,7 +627,7 @@ xfs_rtmodify_range(
629
627
/*
630
628
* Set the word value correctly.
631
629
*/
632
- xfs_rtbitmap_setword (args -> rbmbp , word , val );
630
+ xfs_rtbitmap_setword (args , word , val );
633
631
i += XFS_NBWORD ;
634
632
/*
635
633
* Go on to the next block if that's where the next word is
@@ -640,8 +638,7 @@ xfs_rtmodify_range(
640
638
* Log the changed part of this block.
641
639
* Get the next one.
642
640
*/
643
- xfs_trans_log_rtbitmap (args -> tp , args -> rbmbp , firstword ,
644
- word );
641
+ xfs_trans_log_rtbitmap (args , firstword , word );
645
642
error = xfs_rtbitmap_read_buf (args , ++ block );
646
643
if (error )
647
644
return error ;
@@ -661,19 +658,19 @@ xfs_rtmodify_range(
661
658
/*
662
659
* Set/clear the active bits.
663
660
*/
664
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
661
+ incore = xfs_rtbitmap_getword (args , word );
665
662
if (val )
666
663
incore |= mask ;
667
664
else
668
665
incore &= ~mask ;
669
- xfs_rtbitmap_setword (args -> rbmbp , word , incore );
666
+ xfs_rtbitmap_setword (args , word , incore );
670
667
word ++ ;
671
668
}
672
669
/*
673
670
* Log any remaining changed bytes.
674
671
*/
675
672
if (word > firstword )
676
- xfs_trans_log_rtbitmap (args -> tp , args -> rbmbp , firstword , word );
673
+ xfs_trans_log_rtbitmap (args , firstword , word );
677
674
return 0 ;
678
675
}
679
676
@@ -810,7 +807,7 @@ xfs_rtcheck_range(
810
807
/*
811
808
* Compute difference between actual and desired value.
812
809
*/
813
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
810
+ incore = xfs_rtbitmap_getword (args , word );
814
811
if ((wdiff = (incore ^ val ) & mask )) {
815
812
/*
816
813
* Different, compute first wrong bit and return.
@@ -849,7 +846,7 @@ xfs_rtcheck_range(
849
846
/*
850
847
* Compute difference between actual and desired value.
851
848
*/
852
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
849
+ incore = xfs_rtbitmap_getword (args , word );
853
850
if ((wdiff = incore ^ val )) {
854
851
/*
855
852
* Different, compute first wrong bit and return.
@@ -887,7 +884,7 @@ xfs_rtcheck_range(
887
884
/*
888
885
* Compute difference between actual and desired value.
889
886
*/
890
- incore = xfs_rtbitmap_getword (args -> rbmbp , word );
887
+ incore = xfs_rtbitmap_getword (args , word );
891
888
if ((wdiff = (incore ^ val ) & mask )) {
892
889
/*
893
890
* Different, compute first wrong bit and return.
0 commit comments