diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/loop.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/loop.h')
| -rw-r--r-- | include/linux/loop.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 40725447f5e0..66c194e2d9b9 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h | |||
| @@ -56,8 +56,7 @@ struct loop_device { | |||
| 56 | gfp_t old_gfp_mask; | 56 | gfp_t old_gfp_mask; |
| 57 | 57 | ||
| 58 | spinlock_t lo_lock; | 58 | spinlock_t lo_lock; |
| 59 | struct bio *lo_bio; | 59 | struct bio_list lo_bio_list; |
| 60 | struct bio *lo_biotail; | ||
| 61 | int lo_state; | 60 | int lo_state; |
| 62 | struct mutex lo_ctl_mutex; | 61 | struct mutex lo_ctl_mutex; |
| 63 | struct task_struct *lo_thread; | 62 | struct task_struct *lo_thread; |