summaryrefslogtreecommitdiff
path: root/include/linux/dm-region-hash.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-01 10:55:20 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-01 10:55:20 +0300
commit35858adbfca13678af99fb31618ef4428d6dedb0 (patch)
tree3336feaa61324486945816cb52c347733e7c0821 /include/linux/dm-region-hash.h
parent197d4db752e67160d79fed09968c2140376a80a3 (diff)
parent4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff)
downloadlinux-35858adbfca13678af99fb31618ef4428d6dedb0.tar.xz
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/dm-region-hash.h')
-rw-r--r--include/linux/dm-region-hash.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/dm-region-hash.h b/include/linux/dm-region-hash.h
index a9e652a41373..9e2a7a401df5 100644
--- a/include/linux/dm-region-hash.h
+++ b/include/linux/dm-region-hash.h
@@ -78,8 +78,7 @@ void dm_rh_dec(struct dm_region_hash *rh, region_t region);
/* Delay bios on regions. */
void dm_rh_delay(struct dm_region_hash *rh, struct bio *bio);
-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);
/*
* Region recovery control.