From 1d54492a747a7e56d2243c52b2a8c39bb6f5eae5 Mon Sep 17 00:00:00 2001 From: Eric Seppanen Date: Tue, 23 Aug 2011 21:25:12 +0200 Subject: [PATCH] --- yaml --- r: 264027 b: refs/heads/master c: e8037d49835482c9534a9a07bed0d0ea831135ae h: refs/heads/master i: 264025: eef849c3325ae411e14c8fb57c1c9be4f06c3970 264023: d8ff5ef33f7fcaf0fd459817309c493191edbbeb v: v3 --- [refs] | 2 +- trunk/block/blk-sysfs.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3f0b292867d6..3d794a22a818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89c63a8ef36a621cb6790c1a56c737e6805ad8f4 +refs/heads/master: e8037d49835482c9534a9a07bed0d0ea831135ae diff --git a/trunk/block/blk-sysfs.c b/trunk/block/blk-sysfs.c index 0ee17b5e7fb6..e681805cdb47 100644 --- a/trunk/block/blk-sysfs.c +++ b/trunk/block/blk-sysfs.c @@ -258,11 +258,13 @@ queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count) ret = queue_var_store(&val, page, count); spin_lock_irq(q->queue_lock); - if (val) { + if (val == 2) { queue_flag_set(QUEUE_FLAG_SAME_COMP, q); - if (val == 2) - queue_flag_set(QUEUE_FLAG_SAME_FORCE, q); - } else { + queue_flag_set(QUEUE_FLAG_SAME_FORCE, q); + } else if (val == 1) { + queue_flag_set(QUEUE_FLAG_SAME_COMP, q); + queue_flag_clear(QUEUE_FLAG_SAME_FORCE, q); + } else if (val == 0) { queue_flag_clear(QUEUE_FLAG_SAME_COMP, q); queue_flag_clear(QUEUE_FLAG_SAME_FORCE, q); }