leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dlm for 5.8

Browse Source 
This set includes a couple minor cleanups, and dropping the
 interruptible from a wait_event that waits for an event from
 the userspace cluster management.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJe2op+AAoJEDgbc8f8gGmqJKkP/jE0BCnE7VbpID0sDaBLpntk
 +v53jxR/bpw6g+LwlJGBDLCRrcn8MnhC72W1OPZyFJ4AiuN5BHdvTVVSPSCBSHnU
 WfJKqbVSRt+PRaATJd8iCLdoMj858vLWFo380XVMTRsAaxYJ4dwRUMBUOx/pL8Dy
 pcDXDgWTC06nuRmSY8eYJYJWX3c6SdpHHbg4IA127Y9oTjIAvYyeFC4ohRtRJqrj
 bQlpjnfJ9bNwd5N15turGiR5IzY7UXI9wa/qylngr5B5gVxJttFpaE4OFF80HOkY
 Xxqqqhi9dIcyAAzftJaRQpyAq6kRmFgFAjH5Rvx+7n0BEMe+AAhQC9Coei1Zysh1
 fssYrxRC3fqX1kg2alhpdBdCugFq7IUdFuwH044M+w8jcsoggGq8vGRMJEuKgnnm
 kLLBEi5HtAv0S9rAE9Acnqanc6lRvzJIc0vysG/0LQqzWr+F7HtRnS7kkOkO2+e1
 014k20FmooJiu5XGrCz+dvmnIACpr6Z+S119uXntYGDDA+YGcJQTMs6pzLh5UTqB
 40aIZPPRRj6K/Vvx2VJgEbzwmwWjjdtsYkcJEq+QPPsAkPa8EnbqICCyJDkUuY5K
 kltYHQ2IOa466KC8JHBS9jdVnHftk0jIl75eiP7vK+ZUEW+iwRgEXY11oiWeY23J
 EKfPgi0oikfmlj2Y3jme
 =VTRw
 -----END PGP SIGNATURE-----

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

Pull dlm updates from David Teigland:
 "This set includes a couple minor cleanups, and dropping the
  interruptible from a wait_event that waits for an event from the
  userspace cluster management"

* tag 'dlm-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: remove BUG() before panic()
  dlm: Switch to using wait_event()
  fs:dlm:remove unneeded semicolon in rcom.c
  dlm: user: Replace zero-length array with flexible-array member
  dlm: dlm_internal: Replace zero-length array with flexible-array member
This commit is contained in:
Linus Torvalds 2020-06-05 16:43:16 -07:00
commit e3cea0cad1
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/dlm/dlm_internal.h
View File

@ -97,7 +97,6 @@ do { \
__LINE__, __FILE__, #x, jiffies); \ __LINE__, __FILE__, #x, jiffies); \
{do} \ {do} \
printk("\n"); \ printk("\n"); \
BUG(); \
panic("DLM: Record message above and reboot.\n"); \ panic("DLM: Record message above and reboot.\n"); \
} \ } \
} }
@ -421,7 +420,7 @@ struct dlm_message {
int m_bastmode; int m_bastmode;
int m_asts; int m_asts;
int m_result; /* 0 or -EXXX */ int m_result; /* 0 or -EXXX */
char m_extra[0]; /* name or lvb */ char m_extra[]; /* name or lvb */
}; };
@ -450,7 +449,7 @@ struct dlm_rcom {
uint64_t rc_id; /* match reply with request */ uint64_t rc_id; /* match reply with request */
uint64_t rc_seq; /* sender's ls_recover_seq */ uint64_t rc_seq; /* sender's ls_recover_seq */
uint64_t rc_seq_reply; /* remote ls_recover_seq */ uint64_t rc_seq_reply; /* remote ls_recover_seq */
char rc_buf[0]; char rc_buf[];
}; };
union dlm_packet { union dlm_packet {
@ -506,7 +505,7 @@ struct rcom_lock {
__le16 rl_wait_type; __le16 rl_wait_type;
__le16 rl_namelen; __le16 rl_namelen;
char rl_name[DLM_RESNAME_MAXLEN]; char rl_name[DLM_RESNAME_MAXLEN];
char rl_lvb[0]; char rl_lvb[];
}; };
/* /*

18
fs/dlm/lockspace.c
View File

@ -197,8 +197,6 @@ static struct kset *dlm_kset;
static int do_uevent(struct dlm_ls *ls, int in) static int do_uevent(struct dlm_ls *ls, int in)
{ {
int error;
if (in) if (in)
kobject_uevent(&ls->ls_kobj, KOBJ_ONLINE); kobject_uevent(&ls->ls_kobj, KOBJ_ONLINE);
else else
@ -209,20 +207,12 @@ static int do_uevent(struct dlm_ls *ls, int in)
/* dlm_controld will see the uevent, do the necessary group management /* dlm_controld will see the uevent, do the necessary group management
and then write to sysfs to wake us */ and then write to sysfs to wake us */
error = wait_event_interruptible(ls->ls_uevent_wait, wait_event(ls->ls_uevent_wait,
test_and_clear_bit(LSFL_UEVENT_WAIT, &ls->ls_flags)); test_and_clear_bit(LSFL_UEVENT_WAIT, &ls->ls_flags));
log_rinfo(ls, "group event done %d %d", error, ls->ls_uevent_result); log_rinfo(ls, "group event done %d", ls->ls_uevent_result);
if (error) return ls->ls_uevent_result;
goto out;
error = ls->ls_uevent_result;
out:
if (error)
log_error(ls, "group %s failed %d %d", in ? "join" : "leave",
error, ls->ls_uevent_result);
return error;
} }
static int dlm_uevent(struct kset *kset, struct kobject *kobj, static int dlm_uevent(struct kset *kset, struct kobject *kobj,

2
fs/dlm/rcom.c
View File

@ -563,7 +563,7 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid)
lock = 1; lock = 1;
reply = 1; reply = 1;
break; break;
}; }
spin_lock(&ls->ls_recover_lock); spin_lock(&ls->ls_recover_lock);
status = ls->ls_recover_status; status = ls->ls_recover_status;

2
fs/dlm/user.c
View File

@ -46,7 +46,7 @@ struct dlm_lock_params32 {
__u32 bastaddr; __u32 bastaddr;
__u32 lksb; __u32 lksb;
char lvb[DLM_USER_LVB_LEN]; char lvb[DLM_USER_LVB_LEN];
char name[0]; char name[];
}; };
struct dlm_write_request32 { struct dlm_write_request32 {