[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20060820163016.GA4152@oleg>
Date: Sun, 20 Aug 2006 20:30:16 +0400
From: Oleg Nesterov <oleg@...sign.ru>
To: Jens Axboe <axboe@...e.de>
Cc: Andrew Morton <akpm@...l.org>, linux-kernel@...r.kernel.org
Subject: [PATCH] uninline ioprio_best()
Saves 376 bytes (5 callers) for me.
Signed-off-by: Oleg Nesterov <oleg@...sign.ru>
--- 2.6.18-rc4/include/linux/ioprio.h~4_best 2006-07-16 01:53:08.000000000 +0400
+++ 2.6.18-rc4/include/linux/ioprio.h 2006-08-20 20:17:37.000000000 +0400
@@ -59,27 +59,6 @@ static inline int task_nice_ioprio(struc
/*
* 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
--- 2.6.18-rc4/fs/ioprio.c~4_best 2006-08-20 19:57:14.000000000 +0400
+++ 2.6.18-rc4/fs/ioprio.c 2006-08-20 20:16:39.000000000 +0400
@@ -140,6 +140,29 @@ out:
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists