RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: convert: move and rename dev_t helpers to common file 

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-08-22 20:43:49 +02:00
parent c05c70c77c
commit 4856215f51
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
convert/source-ext2.c
View File

@ -638,21 +638,12 @@ out:
free(ext2_inode); free(ext2_inode);
return ret; return ret;
} }
#define MINORBITS 20
#define MKDEV(ma, mi) (((ma) << MINORBITS) | (mi))
static inline dev_t old_decode_dev(u16 val) static inline dev_t old_decode_dev(u16 val)
{ {
return MKDEV((val >> 8) & 255, val & 255); return MKDEV((val >> 8) & 255, val & 255);
} }
static inline dev_t new_decode_dev(u32 dev)
{
unsigned major = (dev & 0xfff00) >> 8;
unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
return MKDEV(major, minor);
}
static void ext2_copy_inode_item(struct btrfs_inode_item *dst, static void ext2_copy_inode_item(struct btrfs_inode_item *dst,
struct ext2_inode *src, u32 blocksize) struct ext2_inode *src, u32 blocksize)
{ {
@ -692,7 +683,7 @@ static void ext2_copy_inode_item(struct btrfs_inode_item *dst,
old_decode_dev(src->i_block[0])); old_decode_dev(src->i_block[0]));
} else { } else {
btrfs_set_stack_inode_rdev(dst, btrfs_set_stack_inode_rdev(dst,
new_decode_dev(src->i_block[1])); decode_dev(src->i_block[1]));
} }
} }
memset(&dst->reserved, 0, sizeof(dst->reserved)); memset(&dst->reserved, 0, sizeof(dst->reserved));

8
convert/source-fs.c
View File

@ -28,6 +28,14 @@ const struct simple_range btrfs_reserved_ranges[3] = {
{ BTRFS_SB_MIRROR_OFFSET(2), SZ_64K } { BTRFS_SB_MIRROR_OFFSET(2), SZ_64K }
}; };
dev_t decode_dev(u32 dev)
{
unsigned major = (dev & 0xfff00) >> 8;
unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
return MKDEV(major, minor);
}
int ext2_acl_count(size_t size) int ext2_acl_count(size_t size)
{ {
ssize_t s; ssize_t s;

9
convert/source-fs.h
View File

@ -18,9 +18,9 @@
#define __BTRFS_CONVERT_SOURCE_FS_H__ #define __BTRFS_CONVERT_SOURCE_FS_H__
#include "kerncompat.h" #include "kerncompat.h"
#include <linux/kdev_t.h>
#include <pthread.h> #include <pthread.h>
#define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
/* /*
@ -104,6 +104,13 @@ static inline size_t acl_ea_size(int count)
int ext2_acl_count(size_t size); int ext2_acl_count(size_t size);
#ifndef MKDEV
#define MINORBITS 20
#define MKDEV(ma, mi) (((ma) << MINORBITS) | (mi))
#endif
dev_t decode_dev(u32 dev);
struct btrfs_convert_operations { struct btrfs_convert_operations {
const char name[SOURCE_FS_NAME_LEN]; const char name[SOURCE_FS_NAME_LEN];
int (*open_fs)(struct btrfs_convert_context *cctx, const char *devname); int (*open_fs)(struct btrfs_convert_context *cctx, const char *devname);

4
convert/source-reiserfs.c
View File

@ -251,7 +251,7 @@ static void reiserfs_copy_inode_item(struct btrfs_inode_item *inode,
btrfs_set_stack_timespec_sec(&inode->mtime, sd_v1_mtime(sd)); btrfs_set_stack_timespec_sec(&inode->mtime, sd_v1_mtime(sd));
if (!S_ISREG(mode) && !S_ISDIR(mode) && !S_ISLNK(mode)) if (!S_ISREG(mode) && !S_ISDIR(mode) && !S_ISLNK(mode))
rdev = new_decode_dev(sd_v1_rdev(sd)); rdev = decode_dev(sd_v1_rdev(sd));
} else { } else {
struct stat_data *sd = stat_data; struct stat_data *sd = stat_data;
@ -265,7 +265,7 @@ static void reiserfs_copy_inode_item(struct btrfs_inode_item *inode,
btrfs_set_stack_timespec_sec(&inode->mtime, sd_v2_mtime(sd)); btrfs_set_stack_timespec_sec(&inode->mtime, sd_v2_mtime(sd));
if (!S_ISREG(mode) && !S_ISDIR(mode) && !S_ISLNK(mode)) if (!S_ISREG(mode) && !S_ISDIR(mode) && !S_ISLNK(mode))
rdev = new_decode_dev(sd_v2_rdev(sd)); rdev = decode_dev(sd_v2_rdev(sd));
if (copy_inode_flags) if (copy_inode_flags)
reiserfs_convert_inode_flags(inode, sd); reiserfs_convert_inode_flags(inode, sd);

9
convert/source-reiserfs.h
View File

@ -24,19 +24,10 @@
#include <reiserfs/io.h> #include <reiserfs/io.h>
#include <reiserfs/reiserfs_lib.h> #include <reiserfs/reiserfs_lib.h>
#include <reiserfs/reiserfs_fs.h> #include <reiserfs/reiserfs_fs.h>
#include <linux/kdev_t.h>
#include "convert/source-fs.h" #include "convert/source-fs.h"
#define REISERFS_ACL_VERSION 0x0001 #define REISERFS_ACL_VERSION 0x0001
static inline dev_t new_decode_dev(u32 dev)
{
unsigned major = (dev & 0xfff00) >> 8;
unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
return MKDEV(major, minor);
}
#endif /* BTRFSCONVERT_REISERFS */ #endif /* BTRFSCONVERT_REISERFS */
#endif #endif