summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-08-30 09:38:30 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-08-30 09:38:30 -0400
commit5e2b0613ed9f9641937dd5948051631249447c57 (patch)
tree2bccd88b4303e7917824cef45aabbe43cd0d93c2 /fs
parent8fb4b536e7b9dbaf7a6b8204e887b92a14e4352c (diff)
downloadblackbird-op-linux-5e2b0613ed9f9641937dd5948051631249447c57.tar.gz
blackbird-op-linux-5e2b0613ed9f9641937dd5948051631249447c57.zip
[GFS2] Remove unused code from glock layer
Remove the unused sync feature from glocks. This is currently done by calling the required functions to sync pages/blocks directly so this code isn't needed. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-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)
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/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 @@
#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/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)
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/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 {
GLF_LOCK = 1,
GLF_STICKY = 2,
GLF_PREFETCH = 3,
- GLF_SYNC = 4,
GLF_DIRTY = 5,
GLF_SKIP_WAITERS2 = 6,
GLF_GREEDY = 7,
OpenPOWER on IntegriCloud