Commit e014ff8d authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Jens Axboe
Browse files

[PATCH] uninline ioprio_best() 



Saves 376 bytes (5 callers) for me.

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 9f83e45e

fs/ioprio.c

+23 −0
Original line number Diff line number Diff line
@@ -140,6 +140,29 @@ static int get_task_ioprio(struct task_struct *p) 
	return ret;

}



int ioprio_best(unsigned short aprio, unsigned short bprio)

{

	unsigned short aclass = IOPRIO_PRIO_CLASS(aprio);

	unsigned short bclass = IOPRIO_PRIO_CLASS(bprio);



	if (!ioprio_valid(aprio))

		return bprio;

	if (!ioprio_valid(bprio))

		return aprio;



	if (aclass == IOPRIO_CLASS_NONE)

		aclass = IOPRIO_CLASS_BE;

	if (bclass == IOPRIO_CLASS_NONE)

		bclass = IOPRIO_CLASS_BE;



	if (aclass == bclass)

		return min(aprio, bprio);

	if (aclass > bclass)

		return bprio;

	else

		return aprio;

}



asmlinkage long sys_ioprio_get(int which, int who)

{

	struct task_struct *g, *p;

include/linux/ioprio.h

+1 −22
Original line number Diff line number Diff line
@@ -59,27 +59,6 @@ static inline int task_nice_ioprio(struct task_struct *task) 
/*

 * For inheritance, return the highest of the two given priorities

 */

static inline int ioprio_best(unsigned short aprio, unsigned short bprio)

{

	unsigned short aclass = IOPRIO_PRIO_CLASS(aprio);

	unsigned short bclass = IOPRIO_PRIO_CLASS(bprio);



	if (!ioprio_valid(aprio))

		return bprio;

	if (!ioprio_valid(bprio))

		return aprio;



	if (aclass == IOPRIO_CLASS_NONE)

		aclass = IOPRIO_CLASS_BE;

	if (bclass == IOPRIO_CLASS_NONE)

		bclass = IOPRIO_CLASS_BE;



	if (aclass == bclass)

		return min(aprio, bprio);

	if (aclass > bclass)

		return bprio;

	else

		return aprio;

}

extern int ioprio_best(unsigned short aprio, unsigned short bprio);



#endif