diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/linux/loop.h | |
| parent | 24d01c0681bfbc10a99304c48a89ad213d2d7a4b (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge commit 'v2.6.31-rc4' into next
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; |