From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757372AbXGIQg7 (ORCPT ); Mon, 9 Jul 2007 12:36:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758470AbXGIQYe (ORCPT ); Mon, 9 Jul 2007 12:24:34 -0400 Received: from mx1.redhat.com ([66.187.233.31]:42252 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758409AbXGIQY0 (ORCPT ); Mon, 9 Jul 2007 12:24:26 -0400 From: swhiteho@redhat.com To: linux-kernel@vger.kernel.org Cc: cluster-devel@redhat.com, David Teigland , Patrick Caulfield , Steven Whitehouse Subject: [PATCH] [DLM] don't require FS flag on all nodes Date: Mon, 9 Jul 2007 17:02:46 +0100 Message-Id: <11839970691406-git-send-email-swhiteho@redhat.com> X-Mailer: git-send-email 1.5.1.2 In-Reply-To: <1183997067333-git-send-email-swhiteho@redhat.com> References: <11839969822277-git-send-email-swhiteho@redhat.com> <1183996989263-git-send-email-swhiteho@redhat.com> <11839969911617-git-send-email-swhiteho@redhat.com> <1183996996300-git-send-email-swhiteho@redhat.com> <11839969982134-git-send-email-swhiteho@redhat.com> <11839970003764-git-send-email-swhiteho@redhat.com> <11839970032102-git-send-email-swhiteho@redhat.com> <11839970052865-git-send-email-swhiteho@redhat.com> <11839970061096-git-send-email-swhiteho@redhat.com> <1183997008395-git-send-email-swhiteho@redhat.com> <11839970101065-git-send-email-swhiteho@redhat.com> <11839970122624-git-send-email-swhiteho@redhat.com> <11839970143164-git-send-email-swhiteho@redhat.com> <11839970162125-git-send-email-swhiteho@redhat.com> <11839970182635-git-send-email-swhiteho@redhat.com> <11839970204036-git-send-email-swhiteho@redhat.com> <11839970222606-git-send-email-swhiteho@redhat.com> <11839970241526-git-send-email-swhiteho@redhat.com> <1183997026104-git-send-email-swhiteho@redhat.com> <11839970282009-git-send-email-swhiteho@redhat.com> <11839970302426-git-send-email-swhiteho@redhat.com> <11839970324005-git-send-email-swhiteho@redhat.com> <1183997034982-git-send-email-swhiteho@redhat.com> <1183997036270-git-send-email-swhiteho@redhat.com> <11839970383020-git-send-email-swhiteho@redhat.com> <11839970403929-git-send-email-swhiteho@redhat.com> <11839970421091-git-send-email-swhiteho@redhat.com> <11839970442448-git-send-email-swhiteho@redhat.com> <11839970463325-git-send-email-swhiteho@redhat.com> <11839970481383-git-send-email-swhiteho@redhat.com> <1183997050365-git-send-email-swhiteho@redhat.com> <11839970521835-git-send-email-swhiteho@redhat.com> <11839970542719-git-send-email-swhiteho@redhat.com> <1183997056121-git-send-email-swhiteho@redhat.com> <11839970573954-git-send-email-swhiteho@redhat.com> <11839970591207-git-send-email-swhiteho@redhat.com> <11839970611456-git-send-email-swhiteho@redhat.com> <11839970633982-git-send-email-swhiteho@redhat.com> <11839970653759-git-send-email-swhiteho@redhat.com> <1183997067333-git-send-email-swhiteho@redhat.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: David Teigland 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 Signed-off-by: Steven Whitehouse diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index 6802653..1dc7210 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -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; -- 1.5.1.2