diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-12 02:53:38 -0400 |
| commit | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch) | |
| tree | b9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /include/linux/loop.h | |
| parent | 37f9ef553bed630957e025504cdcbc76f5de49d5 (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/kernel/asm-offsets.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; |