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.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index ce5353ac8f3d..70f424fcf1cd 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -354,8 +354,7 @@ int gfs2_jindex_hold(struct gfs2_sbd *sdp, struct gfs2_holder *ji_gh)
354 mutex_lock(&sdp->sd_jindex_mutex); 354 mutex_lock(&sdp->sd_jindex_mutex);
355 355
356 for (;;) { 356 for (;;) {
357 error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 357 error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 0, ji_gh);
358 GL_LOCAL_EXCL, ji_gh);
359 if (error) 358 if (error)
360 break; 359 break;
361 360
@@ -524,8 +523,7 @@ int gfs2_make_fs_rw(struct gfs2_sbd *sdp)
524 struct gfs2_log_header_host head; 523 struct gfs2_log_header_host head;
525 int error; 524 int error;
526 525
527 error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, 526 error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, 0, &t_gh);
528 GL_LOCAL_EXCL, &t_gh);
529 if (error) 527 if (error)
530 return error; 528 return error;
531 529
@@ -578,9 +576,8 @@ int gfs2_make_fs_ro(struct gfs2_sbd *sdp)
578 gfs2_quota_sync(sdp); 576 gfs2_quota_sync(sdp);
579 gfs2_statfs_sync(sdp); 577 gfs2_statfs_sync(sdp);
580 578
581 error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, 579 error = gfs2_glock_nq_init(sdp->sd_trans_gl, LM_ST_SHARED, GL_NOCACHE,
582 GL_LOCAL_EXCL | GL_NOCACHE, 580 &t_gh);
583 &t_gh);
584 if (error && !test_bit(SDF_SHUTDOWN, &sdp->sd_flags)) 581 if (error && !test_bit(SDF_SHUTDOWN, &sdp->sd_flags))
585 return error; 582 return error;
586 583