diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 16:00:04 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 16:00:04 -0500 |
| commit | 07b188ab773e183871e57b33ae37bf635c9f12ba (patch) | |
| tree | 311df8a0dd12fb7bd3e9b5b1a5ca500f0428d679 /include/linux/loop.h | |
| parent | 47c564e10f219f867bdb49225972749a43485a47 (diff) | |
| parent | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/loop.h')
| -rw-r--r-- | include/linux/loop.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 53fa51595443..40f63c9879d2 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h | |||
| @@ -52,7 +52,7 @@ struct loop_device { | |||
| 52 | unsigned lo_blocksize; | 52 | unsigned lo_blocksize; |
| 53 | void *key_data; | 53 | void *key_data; |
| 54 | 54 | ||
| 55 | int old_gfp_mask; | 55 | gfp_t old_gfp_mask; |
| 56 | 56 | ||
| 57 | spinlock_t lo_lock; | 57 | spinlock_t lo_lock; |
| 58 | struct bio *lo_bio; | 58 | struct bio *lo_bio; |