aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-10-13 23:43:19 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-11-30 10:33:38 -0500
commitbd209cc017f231e8536550bdab1bf5da93c32798 (patch)
tree78dc50f723298ed5e2d7ec4965ba162933cf002a /fs/gfs2
parentb5bc9e8b065dbcd4c675e8c158d6e524f221b8e1 (diff)
[GFS2] split and annotate gfs2_statfs_change
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/incore.h4
-rw-r--r--fs/gfs2/ondisk.c4
-rw-r--r--fs/gfs2/ops_super.c2
-rw-r--r--fs/gfs2/super.c22
-rw-r--r--fs/gfs2/super.h4
5 files changed, 18 insertions, 18 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 20c9b4f0e52f..c0a8c3b6a852 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -503,8 +503,8 @@ struct gfs2_sbd {
503 503
504 spinlock_t sd_statfs_spin; 504 spinlock_t sd_statfs_spin;
505 struct mutex sd_statfs_mutex; 505 struct mutex sd_statfs_mutex;
506 struct gfs2_statfs_change sd_statfs_master; 506 struct gfs2_statfs_change_host sd_statfs_master;
507 struct gfs2_statfs_change sd_statfs_local; 507 struct gfs2_statfs_change_host sd_statfs_local;
508 unsigned long sd_statfs_sync_time; 508 unsigned long sd_statfs_sync_time;
509 509
510 /* Resource group stuff */ 510 /* Resource group stuff */
diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c
index 5db0737fcdb5..84c59b165b63 100644
--- a/fs/gfs2/ondisk.c
+++ b/fs/gfs2/ondisk.c
@@ -279,7 +279,7 @@ void gfs2_inum_range_out(const struct gfs2_inum_range_host *ir, void *buf)
279 str->ir_length = cpu_to_be64(ir->ir_length); 279 str->ir_length = cpu_to_be64(ir->ir_length);
280} 280}
281 281
282void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, const void *buf) 282void gfs2_statfs_change_in(struct gfs2_statfs_change_host *sc, const void *buf)
283{ 283{
284 const struct gfs2_statfs_change *str = buf; 284 const struct gfs2_statfs_change *str = buf;
285 285
@@ -288,7 +288,7 @@ void gfs2_statfs_change_in(struct gfs2_statfs_change *sc, const void *buf)
288 sc->sc_dinodes = be64_to_cpu(str->sc_dinodes); 288 sc->sc_dinodes = be64_to_cpu(str->sc_dinodes);
289} 289}
290 290
291void gfs2_statfs_change_out(const struct gfs2_statfs_change *sc, void *buf) 291void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc, void *buf)
292{ 292{
293 struct gfs2_statfs_change *str = buf; 293 struct gfs2_statfs_change *str = buf;
294 294
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index b47d9598c047..9c786d1e702d 100644
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -215,7 +215,7 @@ static int gfs2_statfs(struct dentry *dentry, struct kstatfs *buf)
215{ 215{
216 struct super_block *sb = dentry->d_inode->i_sb; 216 struct super_block *sb = dentry->d_inode->i_sb;
217 struct gfs2_sbd *sdp = sb->s_fs_info; 217 struct gfs2_sbd *sdp = sb->s_fs_info;
218 struct gfs2_statfs_change sc; 218 struct gfs2_statfs_change_host sc;
219 int error; 219 int error;
220 220
221 if (gfs2_tune_get(sdp, gt_statfs_slow)) 221 if (gfs2_tune_get(sdp, gt_statfs_slow))
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;
diff --git a/fs/gfs2/super.h b/fs/gfs2/super.h
index ac95064c1e5a..e590b2df11dc 100644
--- a/fs/gfs2/super.h
+++ b/fs/gfs2/super.h
@@ -45,8 +45,8 @@ int gfs2_statfs_init(struct gfs2_sbd *sdp);
45void gfs2_statfs_change(struct gfs2_sbd *sdp, 45void gfs2_statfs_change(struct gfs2_sbd *sdp,
46 s64 total, s64 free, s64 dinodes); 46 s64 total, s64 free, s64 dinodes);
47int gfs2_statfs_sync(struct gfs2_sbd *sdp); 47int gfs2_statfs_sync(struct gfs2_sbd *sdp);
48int gfs2_statfs_i(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc); 48int gfs2_statfs_i(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *sc);
49int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change *sc); 49int gfs2_statfs_slow(struct gfs2_sbd *sdp, struct gfs2_statfs_change_host *sc);
50 50
51int gfs2_freeze_fs(struct gfs2_sbd *sdp); 51int gfs2_freeze_fs(struct gfs2_sbd *sdp);
52void gfs2_unfreeze_fs(struct gfs2_sbd *sdp); 52void gfs2_unfreeze_fs(struct gfs2_sbd *sdp);