btrfs-progs: convert: move ext2 definitions out of main

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/convert/main.c b/convert/main.c
index 70de44b..5eaa251 100644 (file)
--- a/convert/main.c
+++ b/convert/main.c
@@ -41,29 +41,9 @@
 #include "mkfs/common.h"
 #include "convert/common.h"
 #include "convert/source-fs.h"
+#include "convert/source-ext2.h"
 #include "fsfeatures.h"
 
-#if BTRFSCONVERT_EXT2
-#include <ext2fs/ext2_fs.h>
-#include <ext2fs/ext2fs.h>
-#include <ext2fs/ext2_ext_attr.h>
-
-#define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO)
-
-/*
- * Compatibility code for e2fsprogs 1.41 which doesn't support RO compat flag
- * BIGALLOC.
- * Unlike normal RO compat flag, BIGALLOC affects how e2fsprogs check used
- * space, and btrfs-convert heavily relies on it.
- */
-#ifdef HAVE_OLD_E2FSPROGS
-#define EXT2FS_CLUSTER_RATIO(fs)       (1)
-#define EXT2_CLUSTERS_PER_GROUP(s)     (EXT2_BLOCKS_PER_GROUP(s))
-#define EXT2FS_B2C(fs, blk)            (blk)
-#endif
-
-#endif
-
 static void *print_copied_inodes(void *p)
 {
        struct task_ctx *priv = p;
@@ -1564,16 +1544,6 @@ static void ext2_close_fs(struct btrfs_convert_context *cctx)
        ext2fs_close(cctx->fs_data);
 }
 
-struct dir_iterate_data {
-       struct btrfs_trans_handle *trans;
-       struct btrfs_root *root;
-       struct btrfs_inode_item *inode;
-       u64 objectid;
-       u64 index_cnt;
-       u64 parent;
-       int errcode;
-};
-
 static u8 ext2_filetype_conversion_table[EXT2_FT_MAX] = {
        [EXT2_FT_UNKNOWN]       = BTRFS_FT_UNKNOWN,
        [EXT2_FT_REG_FILE]      = BTRFS_FT_REG_FILE,
@@ -1816,37 +1786,6 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
        return 0;
 }
 
-#define EXT2_ACL_VERSION       0x0001
-
-/* 23.2.5 acl_tag_t values */
-
-#define ACL_UNDEFINED_TAG       (0x00)
-#define ACL_USER_OBJ            (0x01)
-#define ACL_USER                (0x02)
-#define ACL_GROUP_OBJ           (0x04)
-#define ACL_GROUP               (0x08)
-#define ACL_MASK                (0x10)
-#define ACL_OTHER               (0x20)
-
-/* 23.2.7 ACL qualifier constants */
-
-#define ACL_UNDEFINED_ID        ((id_t)-1)
-
-typedef struct {
-       __le16          e_tag;
-       __le16          e_perm;
-       __le32          e_id;
-} ext2_acl_entry;
-
-typedef struct {
-       __le16          e_tag;
-       __le16          e_perm;
-} ext2_acl_entry_short;
-
-typedef struct {
-       __le32          a_version;
-} ext2_acl_header;
-
 static inline int ext2_acl_count(size_t size)
 {
        ssize_t s;
@@ -1863,19 +1802,6 @@ static inline int ext2_acl_count(size_t size)
        }
 }
 
-#define ACL_EA_VERSION         0x0002
-
-typedef struct {
-       __le16          e_tag;
-       __le16          e_perm;
-       __le32          e_id;
-} acl_ea_entry;
-
-typedef struct {
-       __le32          a_version;
-       acl_ea_entry    a_entries[0];
-} acl_ea_header;
-
 static inline size_t acl_ea_size(int count)
 {
        return sizeof(acl_ea_header) + count * sizeof(acl_ea_entry);

diff --git a/convert/source-ext2.h b/convert/source-ext2.h
new file mode 100644 (file)
index 0000000..20a278e
--- /dev/null
+++ b/convert/source-ext2.h
@@ -0,0 +1,113 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#ifndef __BTRFS_CONVERT_SOURCE_EXT2_H__
+#define __BTRFS_CONVERT_SOURCE_EXT2_H__
+
+#if BTRFSCONVERT_EXT2
+
+#include "kerncompat.h"
+
+#include <ext2fs/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+#include <ext2fs/ext2_ext_attr.h>
+#include "convert/source-fs.h"
+
+#define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO)
+
+/*
+ * Compatibility code for e2fsprogs 1.41 which doesn't support RO compat flag
+ * BIGALLOC.
+ * Unlike normal RO compat flag, BIGALLOC affects how e2fsprogs check used
+ * space, and btrfs-convert heavily relies on it.
+ */
+#ifdef HAVE_OLD_E2FSPROGS
+#define EXT2FS_CLUSTER_RATIO(fs)       (1)
+#define EXT2_CLUSTERS_PER_GROUP(s)     (EXT2_BLOCKS_PER_GROUP(s))
+#define EXT2FS_B2C(fs, blk)            (blk)
+#endif
+
+/*
+ * Following xattr/acl related codes are based on codes in
+ * fs/ext3/xattr.c and fs/ext3/acl.c
+ */
+#define EXT2_XATTR_BHDR(ptr) ((struct ext2_ext_attr_header *)(ptr))
+#define EXT2_XATTR_BFIRST(ptr) \
+       ((struct ext2_ext_attr_entry *)(EXT2_XATTR_BHDR(ptr) + 1))
+#define EXT2_XATTR_IHDR(inode) \
+       ((struct ext2_ext_attr_header *) ((void *)(inode) + \
+               EXT2_GOOD_OLD_INODE_SIZE + (inode)->i_extra_isize))
+#define EXT2_XATTR_IFIRST(inode) \
+       ((struct ext2_ext_attr_entry *) ((void *)EXT2_XATTR_IHDR(inode) + \
+               sizeof(EXT2_XATTR_IHDR(inode)->h_magic)))
+
+struct dir_iterate_data {
+       struct btrfs_trans_handle *trans;
+       struct btrfs_root *root;
+       struct btrfs_inode_item *inode;
+       u64 objectid;
+       u64 index_cnt;
+       u64 parent;
+       int errcode;
+};
+
+#define EXT2_ACL_VERSION       0x0001
+
+/* 23.2.5 acl_tag_t values */
+
+#define ACL_UNDEFINED_TAG       (0x00)
+#define ACL_USER_OBJ            (0x01)
+#define ACL_USER                (0x02)
+#define ACL_GROUP_OBJ           (0x04)
+#define ACL_GROUP               (0x08)
+#define ACL_MASK                (0x10)
+#define ACL_OTHER               (0x20)
+
+/* 23.2.7 ACL qualifier constants */
+
+#define ACL_UNDEFINED_ID        ((id_t)-1)
+
+typedef struct {
+       __le16          e_tag;
+       __le16          e_perm;
+       __le32          e_id;
+} ext2_acl_entry;
+
+typedef struct {
+       __le16          e_tag;
+       __le16          e_perm;
+} ext2_acl_entry_short;
+
+typedef struct {
+       __le32          a_version;
+} ext2_acl_header;
+
+#define ACL_EA_VERSION         0x0002
+
+typedef struct {
+       __le16          e_tag;
+       __le16          e_perm;
+       __le32          e_id;
+} acl_ea_entry;
+
+typedef struct {
+       __le32          a_version;
+       acl_ea_entry    a_entries[0];
+} acl_ea_header;
+
+#endif /* BTRFSCONVERT_EXT2 */
+
+#endif