aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorNeil Brown <neilb@notabene.brown>2008-07-08 10:13:28 +1000
committerNeil Brown <neilb@notabene.brown>2008-07-08 10:13:28 +1000
commit0529613a1970fef1ba82ded431e2e2ee35b658af (patch)
tree63d9e89424fa5fe9aef6bf0b6f0ab63f4fe886be /include/linux
parentMerge branch 'master' into for-next (diff)
parentmd: resolve external metadata handling deadlock in md_allow_write (diff)
downloadlinux-dev-0529613a1970fef1ba82ded431e2e2ee35b658af.tar.xz
linux-dev-0529613a1970fef1ba82ded431e2e2ee35b658af.zip
Merge branch 'for-neil' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/md into for-next
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/raid/md.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index b7386ae9d288..dc0e3fcb9f28 100644
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -95,7 +95,7 @@ extern int sync_page_io(struct block_device *bdev, sector_t sector, int size,
struct page *page, int rw);
extern void md_do_sync(mddev_t *mddev);
extern void md_new_event(mddev_t *mddev);
-extern void md_allow_write(mddev_t *mddev);
+extern int md_allow_write(mddev_t *mddev);
extern void md_wait_for_blocked_rdev(mdk_rdev_t *rdev, mddev_t *mddev);
#endif /* CONFIG_MD */