diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /include/linux/device-mapper.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'include/linux/device-mapper.h')
| -rw-r--r-- | include/linux/device-mapper.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 8209e08969f9..66ec05a57955 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h | |||
| @@ -139,6 +139,9 @@ struct target_type { | |||
| 139 | dm_ioctl_fn ioctl; | 139 | dm_ioctl_fn ioctl; |
| 140 | dm_merge_fn merge; | 140 | dm_merge_fn merge; |
| 141 | dm_busy_fn busy; | 141 | dm_busy_fn busy; |
| 142 | |||
| 143 | /* For internal device-mapper use. */ | ||
| 144 | struct list_head list; | ||
| 142 | }; | 145 | }; |
| 143 | 146 | ||
| 144 | struct io_restrictions { | 147 | struct io_restrictions { |