Commit eb43bbac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm 

Pull dlm updates from David Teigland:

 - Delay the cleanup of interrupted posix lock requests until the user
   space result arrives. Previously, the immediate cleanup would lead to
   extraneous warnings when the result arrived.

 - Tracepoint improvements, e.g. adding the lock resource name.

 - Delay the completion of lockspace creation until one full recovery
   cycle has completed. This allows more error cases to be returned to
   the caller.

 - Remove warnings from the locking layer about delayed network replies.
   The recently added midcomms warnings are much more useful.

 - Begin the process of deprecating two unused lock-timeout-related
   features. These features now require enabling via a Kconfig option,
   and enabling them triggers deprecation warnings. We expect to remove
   the code in v6.2.

* tag 'dlm-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  fs: dlm: move kref_put assert for lkb structs
  fs: dlm: don't use deprecated timeout features by default
  fs: dlm: add deprecation Kconfig and warnings for timeouts
  fs: dlm: remove timeout from dlm_user_adopt_orphan
  fs: dlm: remove waiter warnings
  fs: dlm: fix grammar in lowcomms output
  fs: dlm: add comment about lkb IFL flags
  fs: dlm: handle recovery result outside of ls_recover
  fs: dlm: make new_lockspace() wait until recovery completes
  fs: dlm: call dlm_lsop_recover_prep once
  fs: dlm: update comments about recovery and membership handling
  fs: dlm: add resource name to tracepoints
  fs: dlm: remove additional dereference of lksb
  fs: dlm: change ast and bast trace order
  fs: dlm: change posix lock sigint handling
  fs: dlm: use dlm_plock_info for do_unlock_close
  fs: dlm: change plock interrupted message to debug again
  fs: dlm: add pid to debug log
  fs: dlm: plock use list_first_entry
parents 3d7cb6b0 95858989

fs/dlm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -9,6 +9,15 @@ menuconfig DLM 
	A general purpose distributed lock manager for kernel or userspace

	applications.



config DLM_DEPRECATED_API

	bool "DLM deprecated API"

	depends on DLM

	help

	Enables deprecated DLM timeout features that will be removed in

        later Linux kernel releases.



	If you are unsure, say N.



config DLM_DEBUG

	bool "DLM debugging"

	depends on DLM

fs/dlm/Makefile

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

				memory.o \

				midcomms.o \

				netlink.o \

				lowcomms.o \

				plock.o \

				rcom.o \
@@ -18,5 +17,6 @@ dlm-y := ast.o \ 
				requestqueue.o \

				user.o \

				util.o 

dlm-$(CONFIG_DLM_DEPRECATED_API) +=	netlink.o

dlm-$(CONFIG_DLM_DEBUG) +=	debug_fs.o

fs/dlm/ast.c

+2 −2
Original line number Diff line number Diff line
@@ -255,13 +255,13 @@ void dlm_callback_work(struct work_struct *work) 
		if (callbacks[i].flags & DLM_CB_SKIP) {

			continue;

		} else if (callbacks[i].flags & DLM_CB_BAST) {

			bastfn(lkb->lkb_astparam, callbacks[i].mode);

			trace_dlm_bast(ls, lkb, callbacks[i].mode);

			bastfn(lkb->lkb_astparam, callbacks[i].mode);

		} else if (callbacks[i].flags & DLM_CB_CAST) {

			lkb->lkb_lksb->sb_status = callbacks[i].sb_status;

			lkb->lkb_lksb->sb_flags = callbacks[i].sb_flags;

			trace_dlm_ast(ls, lkb);

			castfn(lkb->lkb_astparam);

			trace_dlm_ast(ls, lkb, lkb->lkb_lksb);

		}

	}

fs/dlm/config.c

+14 −7
Original line number Diff line number Diff line
@@ -75,8 +75,9 @@ struct dlm_cluster { 
	unsigned int cl_log_info;

	unsigned int cl_protocol;

	unsigned int cl_mark;

#ifdef CONFIG_DLM_DEPRECATED_API

	unsigned int cl_timewarn_cs;

	unsigned int cl_waitwarn_us;

#endif

	unsigned int cl_new_rsb_count;

	unsigned int cl_recover_callbacks;

	char cl_cluster_name[DLM_LOCKSPACE_LEN];
@@ -102,8 +103,9 @@ enum { 
	CLUSTER_ATTR_LOG_INFO,

	CLUSTER_ATTR_PROTOCOL,

	CLUSTER_ATTR_MARK,

#ifdef CONFIG_DLM_DEPRECATED_API

	CLUSTER_ATTR_TIMEWARN_CS,

	CLUSTER_ATTR_WAITWARN_US,

#endif

	CLUSTER_ATTR_NEW_RSB_COUNT,

	CLUSTER_ATTR_RECOVER_CALLBACKS,

	CLUSTER_ATTR_CLUSTER_NAME,
@@ -224,8 +226,9 @@ CLUSTER_ATTR(log_debug, NULL); 
CLUSTER_ATTR(log_info, NULL);

CLUSTER_ATTR(protocol, dlm_check_protocol_and_dlm_running);

CLUSTER_ATTR(mark, NULL);

#ifdef CONFIG_DLM_DEPRECATED_API

CLUSTER_ATTR(timewarn_cs, dlm_check_zero);

CLUSTER_ATTR(waitwarn_us, NULL);

#endif

CLUSTER_ATTR(new_rsb_count, NULL);

CLUSTER_ATTR(recover_callbacks, NULL);
@@ -240,8 +243,9 @@ static struct configfs_attribute *cluster_attrs[] = { 
	[CLUSTER_ATTR_LOG_INFO] = &cluster_attr_log_info,

	[CLUSTER_ATTR_PROTOCOL] = &cluster_attr_protocol,

	[CLUSTER_ATTR_MARK] = &cluster_attr_mark,

#ifdef CONFIG_DLM_DEPRECATED_API

	[CLUSTER_ATTR_TIMEWARN_CS] = &cluster_attr_timewarn_cs,

	[CLUSTER_ATTR_WAITWARN_US] = &cluster_attr_waitwarn_us,

#endif

	[CLUSTER_ATTR_NEW_RSB_COUNT] = &cluster_attr_new_rsb_count,

	[CLUSTER_ATTR_RECOVER_CALLBACKS] = &cluster_attr_recover_callbacks,

	[CLUSTER_ATTR_CLUSTER_NAME] = &cluster_attr_cluster_name,
@@ -432,8 +436,9 @@ static struct config_group *make_cluster(struct config_group *g, 
	cl->cl_log_debug = dlm_config.ci_log_debug;

	cl->cl_log_info = dlm_config.ci_log_info;

	cl->cl_protocol = dlm_config.ci_protocol;

#ifdef CONFIG_DLM_DEPRECATED_API

	cl->cl_timewarn_cs = dlm_config.ci_timewarn_cs;

	cl->cl_waitwarn_us = dlm_config.ci_waitwarn_us;

#endif

	cl->cl_new_rsb_count = dlm_config.ci_new_rsb_count;

	cl->cl_recover_callbacks = dlm_config.ci_recover_callbacks;

	memcpy(cl->cl_cluster_name, dlm_config.ci_cluster_name,
@@ -954,8 +959,9 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 
#define DEFAULT_LOG_INFO           1

#define DEFAULT_PROTOCOL           DLM_PROTO_TCP

#define DEFAULT_MARK               0

#ifdef CONFIG_DLM_DEPRECATED_API

#define DEFAULT_TIMEWARN_CS      500 /* 5 sec = 500 centiseconds */

#define DEFAULT_WAITWARN_US	   0

#endif

#define DEFAULT_NEW_RSB_COUNT    128

#define DEFAULT_RECOVER_CALLBACKS  0

#define DEFAULT_CLUSTER_NAME      ""
@@ -971,8 +977,9 @@ struct dlm_config_info dlm_config = { 
	.ci_log_info = DEFAULT_LOG_INFO,

	.ci_protocol = DEFAULT_PROTOCOL,

	.ci_mark = DEFAULT_MARK,

#ifdef CONFIG_DLM_DEPRECATED_API

	.ci_timewarn_cs = DEFAULT_TIMEWARN_CS,

	.ci_waitwarn_us = DEFAULT_WAITWARN_US,

#endif

	.ci_new_rsb_count = DEFAULT_NEW_RSB_COUNT,

	.ci_recover_callbacks = DEFAULT_RECOVER_CALLBACKS,

	.ci_cluster_name = DEFAULT_CLUSTER_NAME

fs/dlm/config.h

+2 −1
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ struct dlm_config_info { 
	int ci_log_info;

	int ci_protocol;

	int ci_mark;

#ifdef CONFIG_DLM_DEPRECATED_API

	int ci_timewarn_cs;

	int ci_waitwarn_us;

#endif

	int ci_new_rsb_count;

	int ci_recover_callbacks;

	char ci_cluster_name[DLM_LOCKSPACE_LEN];