X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Fll_fiemap.h;h=1753f144c2d0c5d2355b8f27ba72c36c9e966e7a;hb=7feb45121343af25a320088e07df3bf687011225;hp=6e63c3e70498ec6d9bbeb9a7013a7604dd5cb1aa;hpb=a0cc289c3d87277f79d2f5a64ce212dad6c890f4;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h index 6e63c3e..1753f14 100644 --- a/lustre/include/lustre/ll_fiemap.h +++ b/lustre/include/lustre/ll_fiemap.h @@ -43,12 +43,10 @@ #ifndef _LUSTRE_FIEMAP_H #define _LUSTRE_FIEMAP_H -#if !defined(HAVE_LINUX_FIEMAP_H) || !defined(__KERNEL__) +#if !defined(__KERNEL__) -#ifndef __KERNEL__ #include #include -#endif struct ll_fiemap_extent { __u64 fe_logical; /* logical offset in bytes for the start of @@ -98,7 +96,6 @@ struct ll_user_fiemap { #define FIEMAP_EXTENT_MERGED 0x00001000 /* File does not natively * support extents. Result * merged for efficiency. */ - #else #define ll_fiemap_extent fiemap_extent