From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 06:07:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'device-mapper/for-next'
X-Git-Tag: next-20140106~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbc796b73647a58f8386aeb8ae1674a695abdaa4;p=karo-tx-linux.git

Merge remote-tracking branch 'device-mapper/for-next'

Conflicts:
	drivers/md/dm-thin.c
---

dbc796b73647a58f8386aeb8ae1674a695abdaa4
diff --cc drivers/md/dm-thin.c
index 357eb272dbd9,53dcdfb6e785..f9af4be57108
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@@ -1262,8 -1283,8 +1289,8 @@@ static void process_bio_read_only(struc
  	r = dm_thin_find_block(tc->td, block, 1, &lookup_result);
  	switch (r) {
  	case 0:
 -		if (lookup_result.shared && (rw == WRITE) && bio->bi_size)
 +		if (lookup_result.shared && (rw == WRITE) && bio->bi_iter.bi_size)
- 			bio_io_error(bio);
+ 			handle_unserviceable_bio(tc->pool, bio);
  		else {
  			inc_all_io_entry(tc->pool, bio);
  			remap_and_issue(tc, bio, lookup_result.block);