From 3cbe25ac5c521c3585c0389165a7005fd1f642fd Mon Sep 17 00:00:00 2001 From: Vasily Tarasov Date: Thu, 12 Oct 2006 15:09:51 +0200 Subject: [PATCH] --- yaml --- r: 39494 b: refs/heads/master c: d58cdfb89ce0c6bd5f81ae931a984ef298dbda20 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ioprio.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3f4c02f4168b..636c3caaf23b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cea2885a2e989d1dc19af1fc991717b33b7d1456 +refs/heads/master: d58cdfb89ce0c6bd5f81ae931a984ef298dbda20 diff --git a/trunk/fs/ioprio.c b/trunk/fs/ioprio.c index 6dc6721d9e82..89e8da112a75 100644 --- a/trunk/fs/ioprio.c +++ b/trunk/fs/ioprio.c @@ -150,11 +150,6 @@ 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)