git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
block
/
blk-sysfs.c
diff --git
a/block/blk-sysfs.c
b/block/blk-sysfs.c
index
e85c401
..
304ec73
100644
(file)
--- a/
block/blk-sysfs.c
+++ b/
block/blk-sysfs.c
@@
-146,11
+146,13
@@
static ssize_t queue_nomerges_store(struct request_queue *q, const char *page,
unsigned long nm;
ssize_t ret = queue_var_store(&nm, page, count);
unsigned long nm;
ssize_t ret = queue_var_store(&nm, page, count);
+ spin_lock_irq(q->queue_lock);
if (nm)
if (nm)
-
set_bit(QUEUE_FLAG_NOMERGES, &q->queue_flags
);
+
queue_flag_set(QUEUE_FLAG_NOMERGES, q
);
else
else
-
clear_bit(QUEUE_FLAG_NOMERGES, &q->queue_flags
);
+
queue_flag_clear(QUEUE_FLAG_NOMERGES, q
);
+ spin_unlock_irq(q->queue_lock);
return ret;
}
return ret;
}