diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /include/linux/loop.h | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.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; |