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

Commit 02a982a6 authored by Du, Changbin's avatar Du, Changbin Committed by Linus Torvalds
Browse files

workqueue: update debugobjects fixup callbacks return type 



Update the return type to use bool instead of int, corresponding to
change (debugobjects: make fixup functions return bool instead of int)

Signed-off-by: default avatarDu, Changbin <changbin.du@intel.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Josh Triplett <josh@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7a8e78b

kernel/workqueue.c

+10 −10
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static void *work_debug_hint(void *addr) 
 * fixup_init is called when:

 * - an active object is initialized

 */

static int work_fixup_init(void *addr, enum debug_obj_state state)

static bool work_fixup_init(void *addr, enum debug_obj_state state)

{

	struct work_struct *work = addr;
@@ -445,9 +445,9 @@ static int work_fixup_init(void *addr, enum debug_obj_state state) 
	case ODEBUG_STATE_ACTIVE:

		cancel_work_sync(work);

		debug_object_init(work, &work_debug_descr);

		return 1;

		return true;

	default:

		return 0;

		return false;

	}

}
@@ -456,7 +456,7 @@ static int work_fixup_init(void *addr, enum debug_obj_state state) 
 * - an active object is activated

 * - an unknown object is activated (might be a statically initialized object)

 */

static int work_fixup_activate(void *addr, enum debug_obj_state state)

static bool work_fixup_activate(void *addr, enum debug_obj_state state)

{

	struct work_struct *work = addr;
@@ -471,16 +471,16 @@ static int work_fixup_activate(void *addr, enum debug_obj_state state) 
		if (test_bit(WORK_STRUCT_STATIC_BIT, work_data_bits(work))) {

			debug_object_init(work, &work_debug_descr);

			debug_object_activate(work, &work_debug_descr);

			return 0;

			return false;

		}

		WARN_ON_ONCE(1);

		return 0;

		return false;



	case ODEBUG_STATE_ACTIVE:

		WARN_ON(1);



	default:

		return 0;

		return false;

	}

}
@@ -488,7 +488,7 @@ static int work_fixup_activate(void *addr, enum debug_obj_state state) 
 * fixup_free is called when:

 * - an active object is freed

 */

static int work_fixup_free(void *addr, enum debug_obj_state state)

static bool work_fixup_free(void *addr, enum debug_obj_state state)

{

	struct work_struct *work = addr;
@@ -496,9 +496,9 @@ static int work_fixup_free(void *addr, enum debug_obj_state state) 
	case ODEBUG_STATE_ACTIVE:

		cancel_work_sync(work);

		debug_object_free(work, &work_debug_descr);

		return 1;

		return true;

	default:

		return 0;

		return false;

	}

}