git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linus
[sfrench/cifs-2.6.git]
/
block
/
ll_rw_blk.c
diff --git
a/block/ll_rw_blk.c
b/block/ll_rw_blk.c
index 61d6b3c65b6697105a432378ba452a86ebc346bf..ddd9253f9d55f267120ddf04a014eaecd12d283c 100644
(file)
--- a/
block/ll_rw_blk.c
+++ b/
block/ll_rw_blk.c
@@
-3628,6
+3628,8
@@
struct io_context *current_io_context(gfp_t gfp_flags)
ret->nr_batch_requests = 0; /* because this is 0 */
ret->aic = NULL;
ret->cic_root.rb_node = NULL;
+ /* make sure set_task_ioprio() sees the settings above */
+ smp_wmb();
tsk->io_context = ret;
}