aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/glops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/glops.c')
-rw-r--r--fs/gfs2/glops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index d9334eb72df8..d180c89dd567 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -45,7 +45,7 @@ static void meta_go_sync(struct gfs2_glock *gl, int flags)
45 return; 45 return;
46 46
47 if (test_and_clear_bit(GLF_DIRTY, &gl->gl_flags)) { 47 if (test_and_clear_bit(GLF_DIRTY, &gl->gl_flags)) {
48 gfs2_log_flush_glock(gl); 48 gfs2_log_flush(gl->gl_sbd, gl);
49 gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT); 49 gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT);
50 if (flags & DIO_RELEASE) 50 if (flags & DIO_RELEASE)
51 gfs2_ail_empty_gl(gl); 51 gfs2_ail_empty_gl(gl);
@@ -149,12 +149,12 @@ static void inode_go_sync(struct gfs2_glock *gl, int flags)
149 if (test_bit(GLF_DIRTY, &gl->gl_flags)) { 149 if (test_bit(GLF_DIRTY, &gl->gl_flags)) {
150 if (meta && data) { 150 if (meta && data) {
151 gfs2_page_sync(gl, flags | DIO_START); 151 gfs2_page_sync(gl, flags | DIO_START);
152 gfs2_log_flush_glock(gl); 152 gfs2_log_flush(gl->gl_sbd, gl);
153 gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT); 153 gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT);
154 gfs2_page_sync(gl, flags | DIO_WAIT); 154 gfs2_page_sync(gl, flags | DIO_WAIT);
155 clear_bit(GLF_DIRTY, &gl->gl_flags); 155 clear_bit(GLF_DIRTY, &gl->gl_flags);
156 } else if (meta) { 156 } else if (meta) {
157 gfs2_log_flush_glock(gl); 157 gfs2_log_flush(gl->gl_sbd, gl);
158 gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT); 158 gfs2_meta_sync(gl, flags | DIO_START | DIO_WAIT);
159 } else if (data) 159 } else if (data)
160 gfs2_page_sync(gl, flags | DIO_START | DIO_WAIT); 160 gfs2_page_sync(gl, flags | DIO_START | DIO_WAIT);