diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-04-14 12:01:53 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-04-14 12:01:53 +1000 |
| commit | 63fe08177f92ce21929df8af6361491b98ad12cd (patch) | |
| tree | 7d6f5aa9251f3120e0911483463e14e1137ed81c | |
| parent | b0cbc861a3c05e634520b049b5cc27ad6febb51f (diff) | |
| download | linux-stable-63fe08177f92ce21929df8af6361491b98ad12cd.tar.gz linux-stable-63fe08177f92ce21929df8af6361491b98ad12cd.tar.bz2 linux-stable-63fe08177f92ce21929df8af6361491b98ad12cd.zip | |
md: tiny md.h cleanups
- update inclusion guard and make sure it covers the whole file
- remove superflous #ifdef CONFIG_BLOCK
- make sure all required headers are included so that new users aren't
required to include others before
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | drivers/md/md.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/drivers/md/md.h b/drivers/md/md.h index e9b7f54c24d6..8227ab909d44 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -12,10 +12,17 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _MD_K_H -#define _MD_K_H - -#ifdef CONFIG_BLOCK +#ifndef _MD_MD_H +#define _MD_MD_H + +#include <linux/blkdev.h> +#include <linux/kobject.h> +#include <linux/list.h> +#include <linux/mm.h> +#include <linux/mutex.h> +#include <linux/timer.h> +#include <linux/wait.h> +#include <linux/workqueue.h> #define MaxSector (~(sector_t)0) @@ -408,10 +415,6 @@ static inline void safe_put_page(struct page *p) if (p) put_page(p); } -#endif /* CONFIG_BLOCK */ -#endif - - extern int register_md_personality(struct mdk_personality *p); extern int unregister_md_personality(struct mdk_personality *p); extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev), @@ -434,3 +437,5 @@ extern void md_new_event(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); extern void md_set_array_sectors(mddev_t *mddev, sector_t array_sectors); + +#endif /* _MD_MD_H */ |