Commit 5e2b0613 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 8fb4b536

fs/gfs2/glock.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

fs/gfs2/glock.h

+0 −1
Original line number Diff line number Diff line
@@ -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

fs/gfs2/glops.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}



/**

fs/gfs2/incore.h

+0 −1
Original line number Diff line number Diff line
@@ -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,