diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 20:13:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 20:13:26 +0100 |
| commit | 638691a7a46a4ae9a7b56c603299e42d7f6e722e (patch) | |
| tree | f744b3fbdd4704ef9ae122b67a14785b4a7a6b65 /include | |
| parent | RxRPC: Allocate tokens with kzalloc to avoid oops in rxrpc_destroy (diff) | |
| parent | md: Fix - again - partition detection when array becomes active (diff) | |
| download | linux-638691a7a46a4ae9a7b56c603299e42d7f6e722e.tar.xz linux-638691a7a46a4ae9a7b56c603299e42d7f6e722e.zip | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: Fix - again - partition detection when array becomes active
Fix over-zealous flush_disk when changing device size.
md: avoid spinlock problem in blk_throtl_exit
md: correctly handle probe of an 'mdp' device.
md: don't set_capacity before array is active.
md: Fix raid1->raid0 takeover
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 97d08d8a7de8..e38b50a4b9d2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2140,7 +2140,7 @@ extern void check_disk_size_change(struct gendisk *disk, struct block_device *bdev); extern int revalidate_disk(struct gendisk *); extern int check_disk_change(struct block_device *); -extern int __invalidate_device(struct block_device *); +extern int __invalidate_device(struct block_device *, bool); extern int invalidate_partition(struct gendisk *, int); #endif unsigned long invalidate_mapping_pages(struct address_space *mapping, |