aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r--fs/gfs2/super.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 0faf563c83a9..0ef831727086 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -587,9 +587,9 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp)
587int gfs2_statfs_init(struct gfs2_sbd *sdp) 587int gfs2_statfs_init(struct gfs2_sbd *sdp)
588{ 588{
589 struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode); 589 struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);
590 struct gfs2_statfs_change *m_sc = &sdp->sd_statfs_master; 590 struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master;
591 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode); 591 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode);
592 struct gfs2_statfs_change *l_sc = &sdp->sd_statfs_local; 592 struct gfs2_statfs_change_host *l_sc = &sdp->sd_statfs_local;
593 struct buffer_head *m_bh, *l_bh; 593 struct buffer_head *m_bh, *l_bh;
594 struct gfs2_holder gh; 594 struct gfs2_holder gh;
595 int error; 595 int error;
@@ -634,7 +634,7 @@ void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free,
634 s64 dinodes) 634 s64 dinodes)
635{ 635{
636 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode); 636 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode);
637 struct gfs2_statfs_change *l_sc = &sdp->sd_statfs_local; 637 struct gfs2_statfs_change_host *l_sc = &sdp->sd_statfs_local;
638 struct buffer_head *l_bh; 638 struct buffer_head *l_bh;
639 int error; 639 int error;
640 640
@@ -660,8 +660,8 @@ int gfs2_statfs_sync(struct gfs2_sbd *sdp)
660{ 660{
661 struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode); 661 struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);
662 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode); 662 struct gfs2_inode *l_ip = GFS2_I(sdp->sd_sc_inode);
663 struct gfs2_statfs_change *m_sc = &sdp->sd_statfs_master; 663 struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master;
664 struct gfs2_statfs_change *l_sc = &sdp->sd_statfs_local; 664 struct gfs2_statfs_change_host *l_sc = &sdp->sd_statfs_local;
665 struct gfs2_holder gh; 665 struct gfs2_holder gh;
666 struct buffer_head *m_bh, *l_bh; 666 struct buffer_head *m_bh, *l_bh;
667 int error; 667 int error;
@@ -727,10 +727,10 @@ out:
727 * Returns: errno 727 * Returns: errno
728 */ 728 */
729 729
730int gfs2_statfs_i(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc) 730int gfs2_statfs_i(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *sc)
731{ 731{
732 struct gfs2_statfs_change *m_sc = &sdp->sd_statfs_master; 732 struct gfs2_statfs_change_host *m_sc = &sdp->sd_statfs_master;
733 struct gfs2_statfs_change *l_sc = &sdp->sd_statfs_local; 733 struct gfs2_statfs_change_host *l_sc = &sdp->sd_statfs_local;
734 734
735 spin_lock(&sdp->sd_statfs_spin); 735 spin_lock(&sdp->sd_statfs_spin);
736 736
@@ -760,7 +760,7 @@ int gfs2_statfs_i(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc)
760 */ 760 */
761 761
762static int statfs_slow_fill(struct gfs2_rgrpd *rgd, 762static int statfs_slow_fill(struct gfs2_rgrpd *rgd,
763 struct gfs2_statfs_change *sc) 763 struct gfs2_statfs_change_host *sc)
764{ 764{
765 gfs2_rgrp_verify(rgd); 765 gfs2_rgrp_verify(rgd);
766 sc->sc_total += rgd->rd_ri.ri_data; 766 sc->sc_total += rgd->rd_ri.ri_data;
@@ -782,7 +782,7 @@ static int statfs_slow_fill(struct gfs2_rgrpd *rgd,
782 * Returns: errno 782 * Returns: errno
783 */ 783 */
784 784
785int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc) 785int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *sc)
786{ 786{
787 struct gfs2_holder ri_gh; 787 struct gfs2_holder ri_gh;
788 struct gfs2_rgrpd *rgd_next; 788 struct gfs2_rgrpd *rgd_next;
@@ -792,7 +792,7 @@ int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc)
792 int done; 792 int done;
793 int error = 0, err; 793 int error = 0, err;
794 794
795 memset(sc, 0, sizeof(struct gfs2_statfs_change)); 795 memset(sc, 0, sizeof(struct gfs2_statfs_change_host));
796 gha = kcalloc(slots, sizeof(struct gfs2_holder), GFP_KERNEL); 796 gha = kcalloc(slots, sizeof(struct gfs2_holder), GFP_KERNEL);
797 if (!gha) 797 if (!gha)
798 return -ENOMEM; 798 return -ENOMEM;