The patch titled
as: fix antic_expire check
has been removed from the -mm tree. Its filename was
as-fix-antic_expire-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: as: fix antic_expire check
From: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Fix units mismatch (jiffies vs msecs) in as-iosched.c, spotted by Xiaoning
Ding <dingxn@xxxxxxxxxxxxxxxxxx>.
Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
block/as-iosched.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN block/as-iosched.c~as-fix-antic_expire-check block/as-iosched.c
--- a/block/as-iosched.c~as-fix-antic_expire-check
+++ a/block/as-iosched.c
@@ -569,7 +569,7 @@ static void as_update_iohist(struct as_d
static int as_close_req(struct as_data *ad, struct as_io_context *aic,
struct request *rq)
{
- unsigned long delay; /* milliseconds */
+ unsigned long delay; /* jiffies */
sector_t last = ad->last_sector[ad->batch_data_dir];
sector_t next = rq->sector;
sector_t delta; /* acceptable close offset (in sectors) */
@@ -578,11 +578,11 @@ static int as_close_req(struct as_data *
if (ad->antic_status == ANTIC_OFF || !ad->ioc_finished)
delay = 0;
else
- delay = ((jiffies - ad->antic_start) * 1000) / HZ;
+ delay = jiffies - ad->antic_start;
if (delay == 0)
delta = 8192;
- else if (delay <= 20 && delay <= ad->antic_expire)
+ else if (delay <= (20 * HZ / 1000) && delay <= ad->antic_expire)
delta = 8192 << delay;
else
return 1;
_
Patches currently in -mm which might be from nickpiggin@xxxxxxxxxxxx are
origin.patch
ia64-race-flushing-icache-in-do_no_page-path.patch
lazy-freeing-of-memory-through-madv_free.patch
restore-madv_dontneed-to-its-original-linux-behaviour.patch
mm-merge-populate-and-nopage-into-fault-fixes-nonlinear-fix.patch
convert-hugetlbfs-to-use-vm_ops-fault.patch
only-allow-nonlinear-vmas-for-ram-backed-filesystems.patch
cpuset-remove-sched-domain-hooks-from-cpusets.patch
kblockd-use-flush_work.patch
sched2-sched-domain-sysctl.patch
futex-new-private-futexes.patch
revoke-core-code-break-cow-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
