Commit 265113f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dlm updates from David Teigland:
 "This set includes a number of minor fixes and cleanups related to the
  networking changes in the last release.

  A patch to delay ack messages reduces network traffic significantly"

* tag 'dlm-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  fs: dlm: avoid comms shutdown delay in release_lockspace
  fs: dlm: fix return -EINTR on recovery stopped
  fs: dlm: implement delayed ack handling
  fs: dlm: move receive loop into receive handler
  fs: dlm: fix multiple empty writequeue alloc
  fs: dlm: generic connect func
  fs: dlm: auto load sctp module
  fs: dlm: introduce generic listen
  fs: dlm: move to static proto ops
  fs: dlm: introduce con_next_wq helper
  fs: dlm: cleanup and remove _send_rcom
  fs: dlm: clear CF_APP_LIMITED on close
  fs: dlm: fix typo in tlv prefix
  fs: dlm: use READ_ONCE for config var
  fs: dlm: use sk->sk_socket instead of con->sock
parents b0cfcdd9 ecd95673

fs/dlm/dir.c

+3 −1
Original line number Diff line number Diff line
@@ -85,8 +85,10 @@ int dlm_recover_directory(struct dlm_ls *ls) 
		for (;;) {

			int left;

			error = dlm_recovery_stopped(ls);

			if (error)

			if (error) {

				error = -EINTR;

				goto out_free;

			}



			error = dlm_rcom_names(ls, memb->nodeid,

					       last_name, last_len);

fs/dlm/dlm_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ struct dlm_rcom { 
struct dlm_opt_header {

	uint16_t	t_type;

	uint16_t	t_length;

	uint32_t	o_pad;

	uint32_t	t_pad;

	/* need to be 8 byte aligned */

	char		t_value[];

};

fs/dlm/lockspace.c

+2 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int new_lockspace(const char *name, const char *cluster, 
	ls->ls_exflags = (flags & ~(DLM_LSFL_TIMEWARN | DLM_LSFL_FS |

				    DLM_LSFL_NEWEXCL));



	size = dlm_config.ci_rsbtbl_size;

	size = READ_ONCE(dlm_config.ci_rsbtbl_size);

	ls->ls_rsbtbl_size = size;



	ls->ls_rsbtbl = vmalloc(array_size(size, sizeof(struct dlm_rsbtable)));
@@ -793,6 +793,7 @@ static int release_lockspace(struct dlm_ls *ls, int force) 


	if (ls_count == 1) {

		dlm_scand_stop();

		dlm_clear_members(ls);

		dlm_midcomms_shutdown();

	}

fs/dlm/lowcomms.c

+386 −384

File changed.

Preview size limit exceeded, changes collapsed.

fs/dlm/lowcomms.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ int dlm_lowcomms_resend_msg(struct dlm_msg *msg); 
int dlm_lowcomms_connect_node(int nodeid);

int dlm_lowcomms_nodes_set_mark(int nodeid, unsigned int mark);

int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr, int len);

void dlm_midcomms_receive_done(int nodeid);



#endif				/* __LOWCOMMS_DOT_H__ */