diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
| commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
| tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /include/linux/loop.h | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-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; |