diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-26 17:33:56 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-26 17:33:56 +1000 |
commit | 4a911396c6fe5e9447ba726c0ac4eed3c3eac3d5 (patch) | |
tree | 3237f57ab7c2411cfb1e2440086001d06e6121e0 /drivers/md/dm-verity.c | |
parent | fd0fcaf19bdf5643b26518c5b89867638d49588e (diff) | |
parent | a3949d83537e3aba2412276284865ed4e4a89ab3 (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/md/dm-verity.c')
-rw-r--r-- | drivers/md/dm-verity.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c index b948fd864d45..b373bb7d1c2d 100644 --- a/drivers/md/dm-verity.c +++ b/drivers/md/dm-verity.c @@ -413,7 +413,8 @@ static void verity_work(struct work_struct *w) verity_finish_io(io, verity_verify_io(io)); } -static void verity_end_io(struct bio *bio, int error) +static void verity_end_io(struct bio *bio, int error, + struct batch_complete *batch) { struct dm_verity_io *io = bio->bi_private; |