---

yaml --- r: 38805 b: refs/heads/master c: 5e2b061 h: refs/heads/master i: 38803: 0f7d2e5 v: v3
git-mirror · Aug 30, 2006 · 72a08cc · 72a08cc
1 parent 3119203
commit 72a08cc
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fb4b536e7b9dbaf7a6b8204e887b92a14e4352c
+refs/heads/master: 5e2b0613ed9f9641937dd5948051631249447c57
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
@@ -1296,9 +1296,6 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
 	struct gfs2_glock *gl = gh->gh_gl;
 	const struct gfs2_glock_operations *glops = gl->gl_ops;
 
-	if (gh->gh_flags & GL_SYNC)
-		set_bit(GLF_SYNC, &gl->gl_flags);
-
 	if (gh->gh_flags & GL_NOCACHE)
 		handle_callback(gl, LM_ST_UNLOCKED);
 
@@ -1313,11 +1310,6 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
 		if (glops->go_unlock)
 			glops->go_unlock(gh);
 
-		if (test_bit(GLF_SYNC, &gl->gl_flags)) {
-			if (glops->go_sync)
-				glops->go_sync(gl, DIO_METADATA | DIO_DATA);
-		}
-
 		gl->gl_stamp = jiffies;
 
 		spin_lock(&gl->gl_spin);

diff --git a/trunk/fs/gfs2/glock.h b/trunk/fs/gfs2/glock.h
@@ -24,7 +24,6 @@
 #define GL_SKIP			0x00000100
 #define GL_ATIME		0x00000200
 #define GL_NOCACHE		0x00000400
-#define GL_SYNC			0x00000800
 #define GL_NOCANCEL		0x00001000
 #define GL_AOP			0x00004000
 #define GL_DUMP			0x00008000

diff --git a/trunk/fs/gfs2/glops.c b/trunk/fs/gfs2/glops.c
@@ -137,7 +137,6 @@ static void meta_go_sync(struct gfs2_glock *gl, int flags)
 			gfs2_ail_empty_gl(gl);
 	}
 
-	clear_bit(GLF_SYNC, &gl->gl_flags);
 }
 
 /**
@@ -236,7 +235,6 @@ static void inode_go_sync(struct gfs2_glock *gl, int flags)
 			gfs2_ail_empty_gl(gl);
 	}
 
-	clear_bit(GLF_SYNC, &gl->gl_flags);
 }
 
 /**

diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
@@ -167,7 +167,6 @@ enum {
 	GLF_LOCK		= 1,
 	GLF_STICKY		= 2,
 	GLF_PREFETCH		= 3,
-	GLF_SYNC		= 4,
 	GLF_DIRTY		= 5,
 	GLF_SKIP_WAITERS2	= 6,
 	GLF_GREEDY		= 7,
-Original file line number
+Diff line change
@@ Expand Up / @@ -137,7 +137,6 @@ static void meta_go_sync(struct gfs2_glock *gl, int flags) @@
     			gfs2_ail_empty_gl(gl);
     	}
-    	clear_bit(GLF_SYNC, &gl->gl_flags);
     }
     /**
@@ Expand Down Expand Up / @@ -236,7 +235,6 @@ static void inode_go_sync(struct gfs2_glock *gl, int flags) @@
     			gfs2_ail_empty_gl(gl);
     	}
-    	clear_bit(GLF_SYNC, &gl->gl_flags);
     }
     /**
@@ Expand Down @@