gfs2: Remove GFS2_MIN_LVB_SIZE define (f7be987b) · Commits · 戴 / test

The dlm lockspace is set up to have lock value blocks of GDLM_LVB_SIZE bytes, and dlm is the only lock manager we support, so there is no point in claiming that the lock value block could have any other size. Signed-off-by:

Andreas Gruenbacher <agruenba@redhat.com>

fs/gfs2/glock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -826,7 +826,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
		memset(&gl->gl_lksb, 0, sizeof(struct dlm_lksb));

		if (glops->go_flags & GLOF_LVB) {
		gl->gl_lksb.sb_lvbptr = kzalloc(GFS2_MIN_LVB_SIZE, GFP_NOFS);
		gl->gl_lksb.sb_lvbptr = kzalloc(GDLM_LVB_SIZE, GFP_NOFS);
		if (!gl->gl_lksb.sb_lvbptr) {
		kmem_cache_free(cachep, gl);
		return -ENOMEM;

fs/gfs2/incore.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -387,8 +387,6 @@ struct gfs2_glock {
		struct rhash_head gl_node;
		};

		#define GFS2_MIN_LVB_SIZE 32 /* Min size of LVB that gfs2 supports */

		enum {
		GIF_INVALID = 0,
		GIF_QD_LOCKED = 1,

Admin message