X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Fll_fiemap.h;h=1753f144c2d0c5d2355b8f27ba72c36c9e966e7a;hb=2dc1bb8b7a53077fce8632aabe65b2ce8048a550;hp=9b751a8ebbbe9e1d79dd6142fb52fde63745cff7;hpb=6dbf1ffdec1240fbc8a86210b439d31a6c80c8de;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h index 9b751a8..1753f14 100644 --- a/lustre/include/lustre/ll_fiemap.h +++ b/lustre/include/lustre/ll_fiemap.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,7 +24,7 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* @@ -45,7 +43,10 @@ #ifndef _LUSTRE_FIEMAP_H #define _LUSTRE_FIEMAP_H -#if !defined(HAVE_LINUX_FIEMAP_H) || !defined(__KERNEL__) +#if !defined(__KERNEL__) + +#include +#include struct ll_fiemap_extent { __u64 fe_logical; /* logical offset in bytes for the start of @@ -95,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