X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre%2Fll_fiemap.h;h=0d97f455ef111aef57a8385b905d3301d5abd5ec;hb=77ae71b56e1ed44a0a80a95c465dafd1f41d2e86;hp=93a5ff41c6f0cd04833764a5f469d872e611847e;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h
index 93a5ff4..0d97f45 100644
--- a/lustre/include/lustre/ll_fiemap.h
+++ b/lustre/include/lustre/ll_fiemap.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,79 +45,24 @@
 #ifndef _LUSTRE_FIEMAP_H
 #define _LUSTRE_FIEMAP_H
 
-#if !defined(HAVE_LINUX_FIEMAP_H) || !defined(__KERNEL__)
-
 #ifndef __KERNEL__
-#include <libcfs/posix/posix-types.h>
+#include <stddef.h>
+#include <linux/fiemap.h>
 #endif
 
-struct ll_fiemap_extent {
-        __u64 fe_logical;  /* logical offset in bytes for the start of
-                            * the extent from the beginning of the file */
-        __u64 fe_physical; /* physical offset in bytes for the start
-                            * of the extent from the beginning of the disk */
-        __u64 fe_length;   /* length in bytes for this extent */
-        __u64 fe_reserved64[2];
-        __u32 fe_flags;    /* FIEMAP_EXTENT_* flags for this extent */
-        __u32 fe_device;   /* device number for this extent */
-        __u32 fe_reserved[2];
-};
-
-struct ll_user_fiemap {
-        __u64 fm_start;  /* logical offset (inclusive) at
-                          * which to start mapping (in) */
-        __u64 fm_length; /* logical length of mapping which
-                          * userspace wants (in) */
-        __u32 fm_flags;  /* FIEMAP_FLAG_* flags for request (in/out) */
-        __u32 fm_mapped_extents;/* number of extents that were mapped (out) */
-        __u32 fm_extent_count;  /* size of fm_extents array (in) */
-        __u32 fm_reserved;
-        struct ll_fiemap_extent fm_extents[0]; /* array of mapped extents (out) */
-};
-
-#define FIEMAP_MAX_OFFSET      (~0ULL)
-
-#define FIEMAP_FLAG_SYNC         0x00000001 /* sync file data before map */
-#define FIEMAP_FLAG_XATTR        0x00000002 /* map extended attribute tree */
-
-#define FIEMAP_EXTENT_LAST              0x00000001 /* Last extent in file. */
-#define FIEMAP_EXTENT_UNKNOWN           0x00000002 /* Data location unknown. */
-#define FIEMAP_EXTENT_DELALLOC          0x00000004 /* Location still pending.
-                                                    * Sets EXTENT_UNKNOWN. */
-#define FIEMAP_EXTENT_ENCODED           0x00000008 /* Data can not be read
-                                                    * while fs is unmounted */
-#define FIEMAP_EXTENT_DATA_ENCRYPTED    0x00000080 /* Data is encrypted by fs.
-                                                    * Sets EXTENT_NO_DIRECT. */
-#define FIEMAP_EXTENT_NOT_ALIGNED       0x00000100 /* Extent offsets may not be
-                                                    * block aligned. */
-#define FIEMAP_EXTENT_DATA_INLINE       0x00000200 /* Data mixed with metadata.
-                                                    * Sets EXTENT_NOT_ALIGNED.*/
-#define FIEMAP_EXTENT_DATA_TAIL         0x00000400 /* Multiple files in block.
-                                                    * Sets EXTENT_NOT_ALIGNED.*/
-#define FIEMAP_EXTENT_UNWRITTEN         0x00000800 /* Space allocated, but
-                                                    * no data (i.e. zero). */
-#define FIEMAP_EXTENT_MERGED            0x00001000 /* File does not natively
-                                                    * support extents. Result
-                                                    * merged for efficiency. */
-
-#else
-
-#define ll_fiemap_extent fiemap_extent
-#define ll_user_fiemap   fiemap
-#define fe_device        fe_reserved[0]
-
-#endif /* HAVE_LINUX_FIEMAP_H */
+/* 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 ll_user_fiemap) + extent_count *
-                                               sizeof(struct ll_fiemap_extent));
+	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 ll_user_fiemap)) /
-                                               sizeof(struct ll_fiemap_extent));
+	return (array_size - sizeof(struct fiemap)) /
+	       sizeof(struct fiemap_extent);
 }
 
 #define FIEMAP_FLAG_DEVICE_ORDER 0x40000000 /* return device ordered mapping */
@@ -125,8 +72,8 @@ static inline unsigned fiemap_size_to_count(size_t array_size)
 #endif
 
 /* 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 */
+#define FIEMAP_EXTENT_NO_DIRECT 0x40000000 /* Data mapping undefined */
+#define FIEMAP_EXTENT_NET       0x80000000 /* Data stored remotely.
+					    * Sets NO_DIRECT flag */
 
 #endif /* _LUSTRE_FIEMAP_H */