aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-raid1.c
diff options
context:
space:
mode:
authorKiyoshi Ueda <k-ueda@ct.jp.nec.com>2006-12-08 05:41:06 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:29:09 -0500
commitd2a7ad29a810441e9dacbaddcc2f0c6045390008 (patch)
tree36bea90fa2f286f525a3b4f05adf40ec4d28221c /drivers/md/dm-raid1.c
parent45cbcd798354251b99694086af9d57c99e89bb43 (diff)
[PATCH] dm: map and endio symbolic return codes
Update existing targets to use the new symbols for return values from target map and end_io functions. There is no effect on behaviour. Test results: Done build test without errors. Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com> Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Cc: dm-devel@redhat.com Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md/dm-raid1.c')
-rw-r--r--drivers/md/dm-raid1.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index fc8cbb168e3e..3b3f4c9c3f09 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -1137,7 +1137,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
1137 1137
1138 if (rw == WRITE) { 1138 if (rw == WRITE) {
1139 queue_bio(ms, bio, rw); 1139 queue_bio(ms, bio, rw);
1140 return 0; 1140 return DM_MAPIO_SUBMITTED;
1141 } 1141 }
1142 1142
1143 r = ms->rh.log->type->in_sync(ms->rh.log, 1143 r = ms->rh.log->type->in_sync(ms->rh.log,
@@ -1146,7 +1146,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
1146 return r; 1146 return r;
1147 1147
1148 if (r == -EWOULDBLOCK) /* FIXME: ugly */ 1148 if (r == -EWOULDBLOCK) /* FIXME: ugly */
1149 r = 0; 1149 r = DM_MAPIO_SUBMITTED;
1150 1150
1151 /* 1151 /*
1152 * We don't want to fast track a recovery just for a read 1152 * We don't want to fast track a recovery just for a read
@@ -1159,7 +1159,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
1159 if (!r) { 1159 if (!r) {
1160 /* Pass this io over to the daemon */ 1160 /* Pass this io over to the daemon */
1161 queue_bio(ms, bio, rw); 1161 queue_bio(ms, bio, rw);
1162 return 0; 1162 return DM_MAPIO_SUBMITTED;
1163 } 1163 }
1164 1164
1165 m = choose_mirror(ms, bio->bi_sector); 1165 m = choose_mirror(ms, bio->bi_sector);
@@ -1167,7 +1167,7 @@ static int mirror_map(struct dm_target *ti, struct bio *bio,
1167 return -EIO; 1167 return -EIO;
1168 1168
1169 map_bio(ms, m, bio); 1169 map_bio(ms, m, bio);
1170 return 1; 1170 return DM_MAPIO_REMAPPED;
1171} 1171}
1172 1172
1173static int mirror_end_io(struct dm_target *ti, struct bio *bio, 1173static int mirror_end_io(struct dm_target *ti, struct bio *bio,