diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /fs/xfs/xfs_trans.c | |
parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/xfs/xfs_trans.c')
-rw-r--r-- | fs/xfs/xfs_trans.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 71e4c8dcc69b..140386434aa3 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c | |||
@@ -567,26 +567,26 @@ xfs_trans_apply_sb_deltas( | |||
567 | */ | 567 | */ |
568 | if (!xfs_sb_version_haslazysbcount(&(tp->t_mountp->m_sb))) { | 568 | if (!xfs_sb_version_haslazysbcount(&(tp->t_mountp->m_sb))) { |
569 | if (tp->t_icount_delta) | 569 | if (tp->t_icount_delta) |
570 | be64_add(&sbp->sb_icount, tp->t_icount_delta); | 570 | be64_add_cpu(&sbp->sb_icount, tp->t_icount_delta); |
571 | if (tp->t_ifree_delta) | 571 | if (tp->t_ifree_delta) |
572 | be64_add(&sbp->sb_ifree, tp->t_ifree_delta); | 572 | be64_add_cpu(&sbp->sb_ifree, tp->t_ifree_delta); |
573 | if (tp->t_fdblocks_delta) | 573 | if (tp->t_fdblocks_delta) |
574 | be64_add(&sbp->sb_fdblocks, tp->t_fdblocks_delta); | 574 | be64_add_cpu(&sbp->sb_fdblocks, tp->t_fdblocks_delta); |
575 | if (tp->t_res_fdblocks_delta) | 575 | if (tp->t_res_fdblocks_delta) |
576 | be64_add(&sbp->sb_fdblocks, tp->t_res_fdblocks_delta); | 576 | be64_add_cpu(&sbp->sb_fdblocks, tp->t_res_fdblocks_delta); |
577 | } | 577 | } |
578 | 578 | ||
579 | if (tp->t_frextents_delta) | 579 | if (tp->t_frextents_delta) |
580 | be64_add(&sbp->sb_frextents, tp->t_frextents_delta); | 580 | be64_add_cpu(&sbp->sb_frextents, tp->t_frextents_delta); |
581 | if (tp->t_res_frextents_delta) | 581 | if (tp->t_res_frextents_delta) |
582 | be64_add(&sbp->sb_frextents, tp->t_res_frextents_delta); | 582 | be64_add_cpu(&sbp->sb_frextents, tp->t_res_frextents_delta); |
583 | 583 | ||
584 | if (tp->t_dblocks_delta) { | 584 | if (tp->t_dblocks_delta) { |
585 | be64_add(&sbp->sb_dblocks, tp->t_dblocks_delta); | 585 | be64_add_cpu(&sbp->sb_dblocks, tp->t_dblocks_delta); |
586 | whole = 1; | 586 | whole = 1; |
587 | } | 587 | } |
588 | if (tp->t_agcount_delta) { | 588 | if (tp->t_agcount_delta) { |
589 | be32_add(&sbp->sb_agcount, tp->t_agcount_delta); | 589 | be32_add_cpu(&sbp->sb_agcount, tp->t_agcount_delta); |
590 | whole = 1; | 590 | whole = 1; |
591 | } | 591 | } |
592 | if (tp->t_imaxpct_delta) { | 592 | if (tp->t_imaxpct_delta) { |
@@ -594,19 +594,19 @@ xfs_trans_apply_sb_deltas( | |||
594 | whole = 1; | 594 | whole = 1; |
595 | } | 595 | } |
596 | if (tp->t_rextsize_delta) { | 596 | if (tp->t_rextsize_delta) { |
597 | be32_add(&sbp->sb_rextsize, tp->t_rextsize_delta); | 597 | be32_add_cpu(&sbp->sb_rextsize, tp->t_rextsize_delta); |
598 | whole = 1; | 598 | whole = 1; |
599 | } | 599 | } |
600 | if (tp->t_rbmblocks_delta) { | 600 | if (tp->t_rbmblocks_delta) { |
601 | be32_add(&sbp->sb_rbmblocks, tp->t_rbmblocks_delta); | 601 | be32_add_cpu(&sbp->sb_rbmblocks, tp->t_rbmblocks_delta); |
602 | whole = 1; | 602 | whole = 1; |
603 | } | 603 | } |
604 | if (tp->t_rblocks_delta) { | 604 | if (tp->t_rblocks_delta) { |
605 | be64_add(&sbp->sb_rblocks, tp->t_rblocks_delta); | 605 | be64_add_cpu(&sbp->sb_rblocks, tp->t_rblocks_delta); |
606 | whole = 1; | 606 | whole = 1; |
607 | } | 607 | } |
608 | if (tp->t_rextents_delta) { | 608 | if (tp->t_rextents_delta) { |
609 | be64_add(&sbp->sb_rextents, tp->t_rextents_delta); | 609 | be64_add_cpu(&sbp->sb_rextents, tp->t_rextents_delta); |
610 | whole = 1; | 610 | whole = 1; |
611 | } | 611 | } |
612 | if (tp->t_rextslog_delta) { | 612 | if (tp->t_rextslog_delta) { |