diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 17:33:42 -0400 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/md/dm-io.c | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/md/dm-io.c')
| -rw-r--r-- | drivers/md/dm-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index b8e342fe7586..8f25f628ef16 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c | |||
| @@ -114,7 +114,7 @@ static void dec_count(struct io *io, unsigned int region, int error) | |||
| 114 | wake_up_process(io->sleeper); | 114 | wake_up_process(io->sleeper); |
| 115 | 115 | ||
| 116 | else { | 116 | else { |
| 117 | int r = io->error; | 117 | unsigned long r = io->error; |
| 118 | io_notify_fn fn = io->callback; | 118 | io_notify_fn fn = io->callback; |
| 119 | void *context = io->context; | 119 | void *context = io->context; |
| 120 | 120 | ||