github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dlm for 6.15

Browse Source 
This set includes:
 - two fixes to the recent rcu lookup optimizations
 - a change allowing TCP to be configured with the first of
   multiple IP address
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEcGkeEvkvjdvlR90nOBtzx/yAaaoFAmfhjr0ACgkQOBtzx/yA
 aaqiAQ//Xi59Ah5i6/5+mAeMJLEkXyaWBpdH/pf/TIG/WuD6rBtxikGQPasPkVms
 3ZkbyEU/fWaVjcvhmbzuWgBlbpjc3V17dshQLObrHmUyxdLJMwS9GZC9LJx2ci5E
 OnW5jLnVzHqMFdehJ+2EBuGf3S2UIMpyn6bvd1/9v6/VmYHHYpn2CKcHVRq0PnDB
 inbbCbJJX9TMFH6moXXdKAvYbF54CUfzGgAIEanwKJKg1oK0DHQ3Yvgoo7Rq/Skc
 rnLIR61QfQsQJgQRawEvHW8LASd1RoJFlZu5F+348KyAP/C4jntUBBpYiQualKWG
 jYjDHDJ0ES4q4/F4jkoPHZwOvhkKBQLNBwMZyRabsWbWOdLrmxWbrhH6Q6KhmyDi
 rFG4dZLBms5fhT5fAQDX37+JTFy2HGvhrOeOVF0goCrb2ALQBPZJD7p7aBXULYj9
 VkEP5dv8GOEZWcj5n6l9Rt/dsDIWPix9LjVIKxx5nUML0BI9bXavwyUTfFJyM2My
 VMHX0Y9F+wrXBNHdLgwSAHf2R5zr0WpN65hhnmudwmGyiT5HC28lKld6Gvb4aGeh
 6R5nTP5QF29RKWhFFP0vVghAgX//UMyEweYGZPC7hGTe6GKHVwM55aHI/0/yLL4/
 XHXjeTi6yukM7nB3CsfmeS4tBgj49m1gHL1FHsBPW/8F7pcihxE=
 =e+sv
 -----END PGP SIGNATURE-----

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

Pull dlm updates from David Teigland:

 - two fixes to the recent rcu lookup optimizations

 - a change allowing TCP to be configured with the first of multiple IP
   address

* tag 'dlm-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: make tcp still work in multi-link env
  dlm: fix error if active rsb is not hashed
  dlm: fix error if inactive rsb is not hashed
  dlm: prevent NPD when writing a positive value to event_done
  dlm: increase max number of links for corosync3/knet
This commit is contained in:
Linus Torvalds 2025-03-27 13:04:31 -07:00
commit 0de1e84263
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/dlm/config.h
View File

@ -23,7 +23,7 @@ struct dlm_config_node {
extern const struct rhashtable_params dlm_rhash_rsb_params;
#define DLM_MAX_ADDR_COUNT 3
#define DLM_MAX_ADDR_COUNT 8
#define DLM_PROTO_TCP 0
#define DLM_PROTO_SCTP 1

2
fs/dlm/lock.c
View File

@ -741,6 +741,7 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,
read_lock_bh(&ls->ls_rsbtbl_lock);
if (!rsb_flag(r, RSB_HASHED)) {
read_unlock_bh(&ls->ls_rsbtbl_lock);
error = -EBADR;
goto do_new;
}
@ -784,6 +785,7 @@ static int find_rsb_dir(struct dlm_ls *ls, const void *name, int len,
}
} else {
write_unlock_bh(&ls->ls_rsbtbl_lock);
error = -EBADR;
goto do_new;
}

2
fs/dlm/lockspace.c
View File

@ -576,7 +576,7 @@ static int new_lockspace(const char *name, const char *cluster,
lockspace to start running (via sysfs) in dlm_ls_start(). */
error = do_uevent(ls, 1);
if (error)
if (error < 0)
goto out_recoverd;
/* wait until recovery is successful or failed */

4
fs/dlm/lowcomms.c
View File

@ -1826,8 +1826,8 @@ static int dlm_tcp_listen_validate(void)
{
/* We don't support multi-homed hosts */
if (dlm_local_count > 1) {
log_print("TCP protocol can't handle multi-homed hosts, try SCTP");
return -EINVAL;
log_print("Detect multi-homed hosts but use only the first IP address.");
log_print("Try SCTP, if you want to enable multi-link.");
}
return 0;