Skip to content

Commit

Permalink
Merge tag 'dlm-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Sep 2, 2021
2 parents b0cfcdd + ecd9567 commit 265113f
Show file tree
Hide file tree
Showing 9 changed files with 458 additions and 415 deletions.
4 changes: 3 additions & 1 deletion fs/dlm/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion fs/dlm/dlm_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
};
Expand Down
3 changes: 2 additions & 1 deletion fs/dlm/lockspace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand Down Expand Up @@ -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();
}

Expand Down
Loading

0 comments on commit 265113f

Please sign in to comment.