[DLM] don't require FS flag on all nodes (fad59c13) · Commits · 戴 / test

Mask off the recently added DLM_LSFL_FS flag when setting the exflags. This way all the nodes in the lockspace aren't required to have the FS flag set, since we later check that exflags matches among all nodes. Signed-off-by:

Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by:

David Teigland <teigland@redhat.com> Signed-off-by:

Steven Whitehouse <swhiteho@redhat.com>

fs/dlm/lockspace.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -438,17 +438,18 @@ static int new_lockspace(char name, int namelen, void *lockspace,
		ls->ls_count = 0;
		ls->ls_flags = 0;

		/* ls_exflags are forced to match among nodes, and we don't
		need to require all nodes to have TIMEWARN active */
		if (flags & DLM_LSFL_TIMEWARN)
		set_bit(LSFL_TIMEWARN, &ls->ls_flags);
		ls->ls_exflags = (flags & ~DLM_LSFL_TIMEWARN);

		if (flags & DLM_LSFL_FS)
		ls->ls_allocation = GFP_NOFS;
		else
		ls->ls_allocation = GFP_KERNEL;

		/* ls_exflags are forced to match among nodes, and we don't
		need to require all nodes to have TIMEWARN or FS set */
		ls->ls_exflags = (flags & ~(DLM_LSFL_TIMEWARN \| DLM_LSFL_FS));

		size = dlm_config.ci_rsbtbl_size;
		ls->ls_rsbtbl_size = size;

Admin message