From: Sage Weil Date: Tue, 9 Nov 2010 22:35:33 +0000 (-0800) Subject: fiemap: include linux fiemap.h header; unconditionally compile helper X-Git-Tag: v0.24~212^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e548871868f3e49e9c6fedb522a7c7db8aef47bf;p=ceph.git fiemap: include linux fiemap.h header; unconditionally compile helper If the system doesn't have the header, use our copy. Signed-off-by: Sage Weil --- diff --git a/src/Makefile.am b/src/Makefile.am index 60329e3e6630..238e5e47f589 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -626,6 +626,7 @@ noinst_HEADERS = \ include/inttypes.h\ include/librados.h\ include/librados.hpp\ + include/linux_fiemap.h\ include/lru.h\ include/msgr.h\ include/nstring.h\ diff --git a/src/common/fiemap.cc b/src/common/fiemap.cc index f4f9467f430f..23e614f69177 100644 --- a/src/common/fiemap.cc +++ b/src/common/fiemap.cc @@ -21,10 +21,6 @@ * Author Colin Ian King, colin.king@canonical.com */ - -#ifdef HAVE_FIEMAP_H - - #include #include #include @@ -42,6 +38,7 @@ struct fiemap *read_fiemap(int fd) { struct fiemap *fiemap; int extents_size; + int r; if ((fiemap = (struct fiemap*)malloc(sizeof(struct fiemap))) == NULL) { fprintf(stderr, "Out of memory allocating fiemap\n"); @@ -56,7 +53,8 @@ struct fiemap *read_fiemap(int fd) fiemap->fm_mapped_extents = 0; /* Find out how many extents there are */ - if (ioctl(fd, FS_IOC_FIEMAP, fiemap) < 0) { + r = ioctl(fd, FS_IOC_FIEMAP, fiemap); + if (r < 0) { fprintf(stderr, "fiemap ioctl() failed\n"); goto done_err; } @@ -86,4 +84,3 @@ done_err: return NULL; } -#endif diff --git a/src/include/fiemap.h b/src/include/fiemap.h index d5d163706efd..17b4430a52a8 100644 --- a/src/include/fiemap.h +++ b/src/include/fiemap.h @@ -1,42 +1,23 @@ #ifndef __CEPH_FIEMAP_H #define __CEPH_FIEMAP_H -#include "config.h" +#include "acconfig.h" +/* + * the header is missing on most systems. for the time being at + * least, include our own copy in the repo. + */ #ifdef HAVE_FIEMAP_H - -#include - -extern "C" struct fiemap *read_fiemap(int fd); - +# include #else +# include "linux_fiemap.h" +#endif -/* - the following structures differ from the original structures. - Using it for the fiemap ioctl will not work. -*/ -struct fiemap_extent { - __u64 fe_logical; - __u64 fe_physical; - __u64 fe_length; - __u32 fe_flags; -}; - -struct fiemap { - __u64 fm_start; - __u64 fm_length; - __u32 fm_flags; - __u32 fm_mapped_extents; - __u32 fm_extent_count; - struct fiemap_extent fm_extents[0]; -}; - -static inline struct fiemap *read_fiemap(int fd) -{ - return NULL; -} - +#include +#ifndef FS_IOC_FIEMAP +# define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) #endif +extern "C" struct fiemap *read_fiemap(int fd); #endif diff --git a/src/include/linux_fiemap.h b/src/include/linux_fiemap.h new file mode 100644 index 000000000000..d830747f5c0b --- /dev/null +++ b/src/include/linux_fiemap.h @@ -0,0 +1,68 @@ +/* + * FS_IOC_FIEMAP ioctl infrastructure. + * + * Some portions copyright (C) 2007 Cluster File Systems, Inc + * + * Authors: Mark Fasheh + * Kalpak Shah + * Andreas Dilger + */ + +#ifndef _LINUX_FIEMAP_H +#define _LINUX_FIEMAP_H + +#include + +struct 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_reserved[3]; +}; + +struct 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 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_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR) + +#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_BYPASS. */ +#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. */ +#define FIEMAP_EXTENT_SHARED 0x00002000 /* Space shared with other + * files. */ + +#endif /* _LINUX_FIEMAP_H */