diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-27 12:01:51 +0100 |
| commit | 3ddeb51d9c83931c1ca6abf76a38934c5a1ed918 (patch) | |
| tree | fc2efb59d627135ea2199a8a68415b162646b121 /fs/xfs/xfs_bmap.h | |
| parent | 5a611268b69f05262936dd177205acbce4471358 (diff) | |
| parent | 5ee810072175042775e39bdd3eaaa68884c27805 (diff) | |
| download | kernel_samsung_smdk4412-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.zip kernel_samsung_smdk4412-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.gz kernel_samsung_smdk4412-3ddeb51d9c83931c1ca6abf76a38934c5a1ed918.tar.bz2 | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'fs/xfs/xfs_bmap.h')
| -rw-r--r-- | fs/xfs/xfs_bmap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_bmap.h b/fs/xfs/xfs_bmap.h index 284571c..be2979d 100644 --- a/fs/xfs/xfs_bmap.h +++ b/fs/xfs/xfs_bmap.h @@ -95,7 +95,6 @@ typedef struct xfs_bmap_free /* need write cache flushing and no */ /* additional allocation alignments */ -#define XFS_BMAPI_AFLAG(w) xfs_bmapi_aflag(w) static inline int xfs_bmapi_aflag(int w) { return (w == XFS_ATTR_FORK ? XFS_BMAPI_ATTRFORK : 0); @@ -107,7 +106,6 @@ static inline int xfs_bmapi_aflag(int w) #define DELAYSTARTBLOCK ((xfs_fsblock_t)-1LL) #define HOLESTARTBLOCK ((xfs_fsblock_t)-2LL) -#define XFS_BMAP_INIT(flp,fbp) xfs_bmap_init(flp,fbp) static inline void xfs_bmap_init(xfs_bmap_free_t *flp, xfs_fsblock_t *fbp) { ((flp)->xbf_first = NULL, (flp)->xbf_count = 0, \ |