LU-2800 autoconf: remove LC_RW_TREE_LOCK test

[fs/lustre-release.git] / lustre / include / lustre / ll_fiemap.h

diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h
index 265ea65..1753f14 100644 (file)
--- 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 <stddef.h>
+#include <libcfs/posix/posix-types.h>
 
 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
@@ -122,9 +122,6 @@ static inline unsigned fiemap_size_to_count(size_t array_size)
 #undef FIEMAP_FLAGS_COMPAT
 #endif
 
-#define FIEMAP_FLAGS_COMPAT    (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR | \
-                                FIEMAP_FLAG_DEVICE_ORDER)
-
 /* Lustre specific flags - use a high bit, don't conflict with upstream flag */
 #define FIEMAP_EXTENT_NO_DIRECT         0x40000000 /* Data mapping undefined */
 #define FIEMAP_EXTENT_NET               0x80000000 /* Data stored remotely.