projects
/
cascardo
/
linux.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/rusty/linux-2.6-for-linus
[cascardo/linux.git]
/
drivers
/
block
/
loop.c
diff --git
a/drivers/block/loop.c
b/drivers/block/loop.c
index
f7f1635
..
d3a25b0
100644
(file)
--- a/
drivers/block/loop.c
+++ b/
drivers/block/loop.c
@@
-546,7
+546,7
@@
static void loop_unplug(struct request_queue *q)
{
struct loop_device *lo = q->queuedata;
{
struct loop_device *lo = q->queuedata;
-
clear_bit(QUEUE_FLAG_PLUGGED, &q->queue_flags
);
+
queue_flag_clear_unlocked(QUEUE_FLAG_PLUGGED, q
);
blk_run_address_space(lo->lo_backing_file->f_mapping);
}
blk_run_address_space(lo->lo_backing_file->f_mapping);
}