Merge tag 'upstream-4.1-rc4' of git://git.infradead.org/linux-ubifs

1630ee5e · Linus Torvalds <[email protected]> · 2015-05-16 16:28:01 -07:00

Pull UBI bufix from Richard Weinberger:
 "This contains a single bug fix for the UBI block driver"

* tag 'upstream-4.1-rc4' of git://git.infradead.org/linux-ubifs:
  UBI: block: Add missing cache flushes

Commit: 1630ee5e01c68ebee5e91da42a56f1865ffbfa1b
Parents: 6a8098a4 · 98fb1ffd

Merge commit. Changes below are compared with the first parent: 6a8098a4.

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
drivers/mtd/ubi/block.c	modified	+2	−0	View file

drivers/mtd/ubi/block.c

View file

diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
index db2c05b..c9eb78f 100644
--- a/drivers/mtd/ubi/block.c
+++ b/drivers/mtd/ubi/block.c
@@ -310,6 +310,8 @@ static void ubiblock_do_work(struct work_struct *work)
 	blk_rq_map_sg(req->q, req, pdu->usgl.sg);
 
 	ret = ubiblock_read(pdu);
+	rq_flush_dcache_pages(req);
+
 	blk_mq_end_request(req, ret);
 }
 