diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /include/linux/loop.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-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; |