aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/glock.c8
-rw-r--r--fs/gfs2/glock.h1
-rw-r--r--fs/gfs2/glops.c2
-rw-r--r--fs/gfs2/incore.h1
4 files changed, 0 insertions, 12 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 709e6e0914fd..c3dde8560827 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1296,9 +1296,6 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
1296 struct gfs2_glock *gl = gh->gh_gl; 1296 struct gfs2_glock *gl = gh->gh_gl;
1297 const struct gfs2_glock_operations *glops = gl->gl_ops; 1297 const struct gfs2_glock_operations *glops = gl->gl_ops;
1298 1298
1299 if (gh->gh_flags & GL_SYNC)
1300 set_bit(GLF_SYNC, &gl->gl_flags);
1301
1302 if (gh->gh_flags & GL_NOCACHE) 1299 if (gh->gh_flags & GL_NOCACHE)
1303 handle_callback(gl, LM_ST_UNLOCKED); 1300 handle_callback(gl, LM_ST_UNLOCKED);
1304 1301
@@ -1313,11 +1310,6 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
1313 if (glops->go_unlock) 1310 if (glops->go_unlock)
1314 glops->go_unlock(gh); 1311 glops->go_unlock(gh);
1315 1312
1316 if (test_bit(GLF_SYNC, &gl->gl_flags)) {
1317 if (glops->go_sync)
1318 glops->go_sync(gl, DIO_METADATA | DIO_DATA);
1319 }
1320
1321 gl->gl_stamp = jiffies; 1313 gl->gl_stamp = jiffies;
1322 1314
1323 spin_lock(&gl->gl_spin); 1315 spin_lock(&gl->gl_spin);
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h
index 12bdbfee4ddc..75fad634ced2 100644
--- a/fs/gfs2/glock.h
+++ b/fs/gfs2/glock.h
@@ -24,7 +24,6 @@
24#define GL_SKIP 0x00000100 24#define GL_SKIP 0x00000100
25#define GL_ATIME 0x00000200 25#define GL_ATIME 0x00000200
26#define GL_NOCACHE 0x00000400 26#define GL_NOCACHE 0x00000400
27#define GL_SYNC 0x00000800
28#define GL_NOCANCEL 0x00001000 27#define GL_NOCANCEL 0x00001000
29#define GL_AOP 0x00004000 28#define GL_AOP 0x00004000
30#define GL_DUMP 0x00008000 29#define GL_DUMP 0x00008000
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 0c92c52fc92a..1a30fa9bec7a 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -137,7 +137,6 @@ static void meta_go_sync(struct gfs2_glock *gl, int flags)
137 gfs2_ail_empty_gl(gl); 137 gfs2_ail_empty_gl(gl);
138 } 138 }
139 139
140 clear_bit(GLF_SYNC, &gl->gl_flags);
141} 140}
142 141
143/** 142/**
@@ -236,7 +235,6 @@ static void inode_go_sync(struct gfs2_glock *gl, int flags)
236 gfs2_ail_empty_gl(gl); 235 gfs2_ail_empty_gl(gl);
237 } 236 }
238 237
239 clear_bit(GLF_SYNC, &gl->gl_flags);
240} 238}
241 239
242/** 240/**
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 38098ac292af..362c2422d506 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -167,7 +167,6 @@ enum {
167 GLF_LOCK = 1, 167 GLF_LOCK = 1,
168 GLF_STICKY = 2, 168 GLF_STICKY = 2,
169 GLF_PREFETCH = 3, 169 GLF_PREFETCH = 3,
170 GLF_SYNC = 4,
171 GLF_DIRTY = 5, 170 GLF_DIRTY = 5,
172 GLF_SKIP_WAITERS2 = 6, 171 GLF_SKIP_WAITERS2 = 6,
173 GLF_GREEDY = 7, 172 GLF_GREEDY = 7,