Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cefcab3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (34 commits)
  [GFS2] Uncomment sprintf_symbol calling code
  [DLM] lowcomms style
  [GFS2] printk warning fixes
  [GFS2] Patch to fix mmap of stuffed files
  [GFS2] use lib/parser for parsing mount options
  [DLM] Lowcomms nodeid range & initialisation fixes
  [DLM] Fix dlm_lowcoms_stop hang
  [DLM] fix mode munging
  [GFS2] lockdump improvements
  [GFS2] Patch to detect corrupt number of dir entries in leaf and/or inode blocks
  [GFS2] bz 236008: Kernel gpf doing cat /debugfs/gfs2/xxx (lock dump)
  [DLM] fs/dlm/ast.c should #include "ast.h"
  [DLM] Consolidate transport protocols
  [DLM] Remove redundant assignment
  [GFS2] Fix bz 234168 (ignoring rgrp flags)
  [DLM] change lkid format
  [DLM] interface for purge (2/2)
  [DLM] add orphan purging code (1/2)
  [DLM] split create_message function
  [GFS2] Set drop_count to 0 (off) by default
  ...
parents 5f757f91 37fde8ca

fs/dlm/Kconfig

+7 −24
Original line number Diff line number Diff line
@@ -3,30 +3,13 @@ menu "Distributed Lock Manager" 


config DLM

	tristate "Distributed Lock Manager (DLM)"

	depends on SYSFS && (IPV6 || IPV6=n)

	depends on IPV6 || IPV6=n

	select CONFIGFS_FS

	select IP_SCTP if DLM_SCTP

	select IP_SCTP

	help

	A general purpose distributed lock manager for kernel or userspace

	applications.



choice

	prompt "Select DLM communications protocol"

	depends on DLM

	default DLM_TCP

	help

	  The DLM Can use TCP or SCTP for it's network communications.

	  SCTP supports multi-homed operations whereas TCP doesn't.

	  However, SCTP seems to have stability problems at the moment.



config DLM_TCP

	bool "TCP/IP"



config DLM_SCTP

	bool "SCTP"



endchoice



config DLM_DEBUG

	bool "DLM debugging"

	depends on DLM

fs/dlm/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ dlm-y := ast.o \ 
				member.o \

				memory.o \

				midcomms.o \

				lowcomms.o \

				rcom.o \

				recover.o \

				recoverd.o \
@@ -16,6 +17,3 @@ dlm-y := ast.o \ 
				util.o 

dlm-$(CONFIG_DLM_DEBUG) +=	debug_fs.o

dlm-$(CONFIG_DLM_TCP)   += lowcomms-tcp.o



dlm-$(CONFIG_DLM_SCTP)  += lowcomms-sctp.o
 
 No newline at end of file

fs/dlm/ast.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "dlm_internal.h"

#include "lock.h"

#include "user.h"

#include "ast.h"



#define WAKE_ASTS  0

fs/dlm/config.c

+8 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
*******************************************************************************

**

**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.

**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.

**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.

**

**  This copyrighted material is made available to anyone wishing to use,

**  modify, copy, or redistribute it subject to the terms and conditions
@@ -89,6 +89,7 @@ struct cluster { 
	unsigned int cl_toss_secs;

	unsigned int cl_scan_secs;

	unsigned int cl_log_debug;

	unsigned int cl_protocol;

};



enum {
@@ -101,6 +102,7 @@ enum { 
	CLUSTER_ATTR_TOSS_SECS,

	CLUSTER_ATTR_SCAN_SECS,

	CLUSTER_ATTR_LOG_DEBUG,

	CLUSTER_ATTR_PROTOCOL,

};



struct cluster_attribute {
@@ -159,6 +161,7 @@ CLUSTER_ATTR(recover_timer, 1); 
CLUSTER_ATTR(toss_secs, 1);

CLUSTER_ATTR(scan_secs, 1);

CLUSTER_ATTR(log_debug, 0);

CLUSTER_ATTR(protocol, 0);



static struct configfs_attribute *cluster_attrs[] = {

	[CLUSTER_ATTR_TCP_PORT] = &cluster_attr_tcp_port.attr,
@@ -170,6 +173,7 @@ static struct configfs_attribute *cluster_attrs[] = { 
	[CLUSTER_ATTR_TOSS_SECS] = &cluster_attr_toss_secs.attr,

	[CLUSTER_ATTR_SCAN_SECS] = &cluster_attr_scan_secs.attr,

	[CLUSTER_ATTR_LOG_DEBUG] = &cluster_attr_log_debug.attr,

	[CLUSTER_ATTR_PROTOCOL] = &cluster_attr_protocol.attr,

	NULL,

};
@@ -904,6 +908,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 
#define DEFAULT_TOSS_SECS         10

#define DEFAULT_SCAN_SECS          5

#define DEFAULT_LOG_DEBUG          0

#define DEFAULT_PROTOCOL           0



struct dlm_config_info dlm_config = {

	.ci_tcp_port = DEFAULT_TCP_PORT,
@@ -914,6 +919,7 @@ struct dlm_config_info dlm_config = { 
	.ci_recover_timer = DEFAULT_RECOVER_TIMER,

	.ci_toss_secs = DEFAULT_TOSS_SECS,

	.ci_scan_secs = DEFAULT_SCAN_SECS,

	.ci_log_debug = DEFAULT_LOG_DEBUG

	.ci_log_debug = DEFAULT_LOG_DEBUG,

	.ci_protocol = DEFAULT_PROTOCOL

};

fs/dlm/config.h

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
*******************************************************************************

**

**  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.

**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.

**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.

**

**  This copyrighted material is made available to anyone wishing to use,

**  modify, copy, or redistribute it subject to the terms and conditions
@@ -26,6 +26,7 @@ struct dlm_config_info { 
	int ci_toss_secs;

	int ci_scan_secs;

	int ci_log_debug;

	int ci_protocol;

};



extern struct dlm_config_info dlm_config;