--- olpc-2.6-master.00/block/cfq-iosched.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/block/cfq-iosched.c	2007-03-01 11:52:20.000000000 -0500
@@ -223,6 +223,8 @@ static int cfq_queue_empty(request_queue
 
 static inline pid_t cfq_queue_pid(struct task_struct *task, int rw, int is_sync)
 {
+	if (task->xid)
+		return task->xid + (1 << 16);
 	/*
 	 * Use the per-process queue, for read requests and syncronous writes
 	 */