aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/incore.h1
-rw-r--r--fs/gfs2/ops_fstype.c1
-rw-r--r--fs/gfs2/super.c4
3 files changed, 0 insertions, 6 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 51166c12c5d7..350b5169a9a0 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -529,7 +529,6 @@ struct gfs2_sbd {
529 /* StatFS stuff */ 529 /* StatFS stuff */
530 530
531 spinlock_t sd_statfs_spin; 531 spinlock_t sd_statfs_spin;
532 struct mutex sd_statfs_mutex;
533 struct gfs2_statfs_change_host sd_statfs_master; 532 struct gfs2_statfs_change_host sd_statfs_master;
534 struct gfs2_statfs_change_host sd_statfs_local; 533 struct gfs2_statfs_change_host sd_statfs_local;
535 unsigned long sd_statfs_sync_time; 534 unsigned long sd_statfs_sync_time;
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 0921f17a164c..79f9bb365f10 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -60,7 +60,6 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
60 60
61 mutex_init(&sdp->sd_inum_mutex); 61 mutex_init(&sdp->sd_inum_mutex);
62 spin_lock_init(&sdp->sd_statfs_spin); 62 spin_lock_init(&sdp->sd_statfs_spin);
63 mutex_init(&sdp->sd_statfs_mutex);
64 63
65 spin_lock_init(&sdp->sd_rindex_spin); 64 spin_lock_init(&sdp->sd_rindex_spin);
66 mutex_init(&sdp->sd_rindex_mutex); 65 mutex_init(&sdp->sd_rindex_mutex);
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 22e09660d648..5d0017d313a3 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -688,9 +688,7 @@ void gfs2_statfs_change(struct gfs2_sbd *sdp, s64 total, s64 free,
688 if (error) 688 if (error)
689 return; 689 return;
690 690
691 mutex_lock(&sdp->sd_statfs_mutex);
692 gfs2_trans_add_bh(l_ip->i_gl, l_bh, 1); 691 gfs2_trans_add_bh(l_ip->i_gl, l_bh, 1);
693 mutex_unlock(&sdp->sd_statfs_mutex);
694 692
695 spin_lock(&sdp->sd_statfs_spin); 693 spin_lock(&sdp->sd_statfs_spin);
696 l_sc->sc_total += total; 694 l_sc->sc_total += total;
@@ -738,9 +736,7 @@ int gfs2_statfs_sync(struct gfs2_sbd *sdp)
738 if (error) 736 if (error)
739 goto out_bh2; 737 goto out_bh2;
740 738
741 mutex_lock(&sdp->sd_statfs_mutex);
742 gfs2_trans_add_bh(l_ip->i_gl, l_bh, 1); 739 gfs2_trans_add_bh(l_ip->i_gl, l_bh, 1);
743 mutex_unlock(&sdp->sd_statfs_mutex);
744 740
745 spin_lock(&sdp->sd_statfs_spin); 741 spin_lock(&sdp->sd_statfs_spin);
746 m_sc->sc_total += l_sc->sc_total; 742 m_sc->sc_total += l_sc->sc_total;