Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19d37ce2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dlm fixes from David Teigland:
 "This set fixes error reporting for dlm sockets, removes the unbound
  property on the dlm callback workqueue to improve performance, and
  includes a couple trivial changes"

* tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: fix error return code in sctp_accept_from_sock()
  dlm: don't specify WQ_UNBOUND for the ast callback workqueue
  dlm: remove lock_sock to avoid scheduling while atomic
  dlm: don't save callbacks after accept
  dlm: audit and remove any unnecessary uses of module.h
  dlm: make genl_ops const
parents 3e5cecf2 26c1ec2f

fs/dlm/ast.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void dlm_callback_work(struct work_struct *work) 
int dlm_callback_start(struct dlm_ls *ls)

{

	ls->ls_callback_wq = alloc_workqueue("dlm_callback",

					     WQ_UNBOUND | WQ_MEM_RECLAIM, 0);

					     WQ_HIGHPRI | WQ_MEM_RECLAIM, 0);

	if (!ls->ls_callback_wq) {

		log_print("can't start dlm_callback workqueue");

		return -ENOMEM;

fs/dlm/config.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
******************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/configfs.h>

#include <linux/slab.h>

#include <linux/in.h>

fs/dlm/debug_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <linux/pagemap.h>

#include <linux/seq_file.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/ctype.h>

#include <linux/debugfs.h>

#include <linux/slab.h>

fs/dlm/dlm_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 * This is the main header file to be included in each DLM source file.

 */



#include <linux/module.h>

#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/types.h>

fs/dlm/lockspace.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
*******************************************************************************

******************************************************************************/



#include <linux/module.h>



#include "dlm_internal.h"

#include "lockspace.h"

#include "member.h"