diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 01:41:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 01:41:07 -0800 |
| commit | c6f7afaeeda5b3c42ea8d7b27e197d223a04675e (patch) | |
| tree | 9a86bc9593ef8219bfc469e277d1b327f38aed9e /fs/exofs/pnfs.h | |
| parent | 34e2fde8a496cf9d7c184ef12eafd3dd854586f1 (diff) | |
| parent | efd124b999fb4d426b30675f1684521af0872789 (diff) | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: simple_write_end does not mark_inode_dirty
exofs: fix pnfs_osd re-definitions in pre-pnfs trees
Diffstat (limited to 'fs/exofs/pnfs.h')
| -rw-r--r-- | fs/exofs/pnfs.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/exofs/pnfs.h b/fs/exofs/pnfs.h index 423033addd1..c52e9888b8a 100644 --- a/fs/exofs/pnfs.h +++ b/fs/exofs/pnfs.h @@ -15,13 +15,7 @@ #ifndef __EXOFS_PNFS_H__ #define __EXOFS_PNFS_H__ -#if defined(CONFIG_PNFS) - - -/* FIXME: move this file to: linux/exportfs/pnfs_osd_xdr.h */ -#include "../nfs/objlayout/pnfs_osd_xdr.h" - -#else /* defined(CONFIG_PNFS) */ +#if ! defined(__PNFS_OSD_XDR_H__) enum pnfs_iomode { IOMODE_READ = 1, @@ -46,6 +40,6 @@ struct pnfs_osd_data_map { u32 odm_raid_algorithm; }; -#endif /* else defined(CONFIG_PNFS) */ +#endif /* ! defined(__PNFS_OSD_XDR_H__) */ #endif /* __EXOFS_PNFS_H__ */ |