From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Teigland Date: Mon, 11 Jun 2007 10:47:18 -0500 Subject: [Cluster-devel] [PATCH] dlm: don't require FS flag on all nodes Message-ID: <20070611154718.GA19371@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 Signed-off-by: David Teigland Index: linux-quilt/fs/dlm/lockspace.c =================================================================== --- linux-quilt.orig/fs/dlm/lockspace.c 2007-06-06 08:47:45.000000000 -0500 +++ linux-quilt/fs/dlm/lockspace.c 2007-06-11 10:34:28.000000000 -0500 @@ -438,17 +438,18 @@ 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;