X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Fll_fiemap.h;h=e5466c78862384e3b50a8d15e271312dbc770d0b;hb=800ffd4711863e1067a693f1283bccf4edddf2a2;hp=0d97f455ef111aef57a8385b905d3301d5abd5ec;hpb=0754bc8f2623bea184111af216f7567608db35b6;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h
index 0d97f45..e5466c7 100644
--- a/lustre/include/lustre/ll_fiemap.h
+++ b/lustre/include/lustre/ll_fiemap.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -42,38 +38,12 @@
  * Author: Andreas Dilger <adilger@sun.com>
  */
 
-#ifndef _LUSTRE_FIEMAP_H
-#define _LUSTRE_FIEMAP_H
-
-#ifndef __KERNEL__
-#include <stddef.h>
-#include <linux/fiemap.h>
-#endif
-
-/* XXX: We use fiemap_extent::fe_reserved[0] */
-#define fe_device	fe_reserved[0]
-
-static inline size_t fiemap_count_to_size(size_t extent_count)
-{
-	return sizeof(struct fiemap) + extent_count *
-				       sizeof(struct fiemap_extent);
-}
-
-static inline unsigned fiemap_size_to_count(size_t array_size)
-{
-	return (array_size - sizeof(struct fiemap)) /
-	       sizeof(struct fiemap_extent);
-}
-
-#define FIEMAP_FLAG_DEVICE_ORDER 0x40000000 /* return device ordered mapping */
-
-#ifdef FIEMAP_FLAGS_COMPAT
-#undef FIEMAP_FLAGS_COMPAT
-#endif
+/*
+ * NOTE: This file is DEPRECATED! Please include linux/lustre/lustre_fiemap.h
+ * directly instead of this file. This file will be removed from a
+ * future version of lustre!
+ */
 
-/* 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.
-					    * Sets NO_DIRECT flag */
+#include <linux/lustre/lustre_fiemap.h>
 
-#endif /* _LUSTRE_FIEMAP_H */
+#warning "Including ll_fiemap.h is deprecated. Include linux/lustre/lustre_fiemap.h directly."