git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm raid1: remove bio_endio from dm_rh_mark_nosync
[safe/jmp/linux-2.6]
/
drivers
/
md
/
dm-region-hash.c
diff --git
a/drivers/md/dm-region-hash.c
b/drivers/md/dm-region-hash.c
index
00806b7
..
5f19ceb
100644
(file)
--- a/
drivers/md/dm-region-hash.c
+++ b/
drivers/md/dm-region-hash.c
@@
-383,8
+383,6
@@
static void complete_resync_work(struct dm_region *reg, int success)
/* dm_rh_mark_nosync
* @ms
* @bio
/* dm_rh_mark_nosync
* @ms
* @bio
- * @done
- * @error
*
* The bio was written on some mirror(s) but failed on other mirror(s).
* We can successfully endio the bio but should avoid the region being
*
* The bio was written on some mirror(s) but failed on other mirror(s).
* We can successfully endio the bio but should avoid the region being
@@
-392,8
+390,7
@@
static void complete_resync_work(struct dm_region *reg, int success)
*
* This function is _not_ safe in interrupt context!
*/
*
* This function is _not_ safe in interrupt context!
*/
-void dm_rh_mark_nosync(struct dm_region_hash *rh,
- struct bio *bio, unsigned done, int error)
+void dm_rh_mark_nosync(struct dm_region_hash *rh, struct bio *bio)
{
unsigned long flags;
struct dm_dirty_log *log = rh->log;
{
unsigned long flags;
struct dm_dirty_log *log = rh->log;
@@
-430,7
+427,6
@@
void dm_rh_mark_nosync(struct dm_region_hash *rh,
BUG_ON(!list_empty(®->list));
spin_unlock_irqrestore(&rh->region_lock, flags);
BUG_ON(!list_empty(®->list));
spin_unlock_irqrestore(&rh->region_lock, flags);
- bio_endio(bio, error);
if (recovering)
complete_resync_work(reg, 0);
}
if (recovering)
complete_resync_work(reg, 0);
}