diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:45:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 16:45:03 -0700 |
| commit | 6ae7d6f0195a0ec7e5d07821e62c79898cd33fdc (patch) | |
| tree | ed7975b5ae042e16500c1f5cb8b5756a6bf8d643 /include/linux/virtio_blk.h | |
| parent | ec30c5f3a18722f8fcf8c83146a10b03ac4d9ff1 (diff) | |
| parent | 1842f23c05b6a866be831aa60bc8a8731c58ddd0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest and virtio: cleanup struct definitions to Linux style.
lguest: update commentry
lguest: fix comment style
virtio: refactor find_vqs
virtio: delete vq from list
virtio: fix memory leak on device removal
lguest: fix descriptor corruption in example launcher
lguest: dereferencing freed mem in add_eventfd()
Diffstat (limited to 'include/linux/virtio_blk.h')
| -rw-r--r-- | include/linux/virtio_blk.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h index be7d255fc7c..8dab9f2b883 100644 --- a/include/linux/virtio_blk.h +++ b/include/linux/virtio_blk.h @@ -20,8 +20,7 @@ #define VIRTIO_BLK_ID_BYTES (sizeof(__u16[256])) /* IDENTIFY DATA */ -struct virtio_blk_config -{ +struct virtio_blk_config { /* The capacity (in 512-byte sectors). */ __u64 capacity; /* The maximum segment size (if VIRTIO_BLK_F_SIZE_MAX) */ @@ -50,8 +49,7 @@ struct virtio_blk_config #define VIRTIO_BLK_T_BARRIER 0x80000000 /* This is the first element of the read scatter-gather list. */ -struct virtio_blk_outhdr -{ +struct virtio_blk_outhdr { /* VIRTIO_BLK_T* */ __u32 type; /* io priority. */ |