diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-01-13 08:47:54 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-01-13 08:47:54 -0500 |
| commit | 81c5e2ae33c4b19e53966b427e33646bf6811830 (patch) | |
| tree | a602a6dd100165c8948bfa713e6f0b422dcba5d8 /include/linux/fs.h | |
| parent | 797a455d2c682476c3797dbfecf5bf84c1e3b9d3 (diff) | |
| parent | fcc57045d53edc35bcce456e60ac4aa802712934 (diff) | |
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index f48501563917..997d22efdef0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -662,6 +662,7 @@ struct block_device { | |||
| 662 | void * bd_claiming; | 662 | void * bd_claiming; |
| 663 | void * bd_holder; | 663 | void * bd_holder; |
| 664 | int bd_holders; | 664 | int bd_holders; |
| 665 | bool bd_write_holder; | ||
| 665 | #ifdef CONFIG_SYSFS | 666 | #ifdef CONFIG_SYSFS |
| 666 | struct gendisk * bd_holder_disk; /* for sysfs slave linkng */ | 667 | struct gendisk * bd_holder_disk; /* for sysfs slave linkng */ |
| 667 | #endif | 668 | #endif |