diff options
| author | David Sterba <dsterba@suse.com> | 2017-08-22 20:43:49 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-09-08 16:15:05 +0200 |
| commit | 4856215f51b4cc7f4bdaef07fc30bba1e8525653 (patch) | |
| tree | 36ce0418db28f55d56963845adfe456179d0df80 /convert/source-ext2.c | |
| parent | c05c70c77ca797549e45c971bc3c02bb3ec79e6e (diff) | |
btrfs-progs: convert: move and rename dev_t helpers to common file
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'convert/source-ext2.c')
| -rw-r--r-- | convert/source-ext2.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/convert/source-ext2.c b/convert/source-ext2.c index cdaf6698..f1075da5 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -638,21 +638,12 @@ out: free(ext2_inode); return ret; } -#define MINORBITS 20 -#define MKDEV(ma, mi) (((ma) << MINORBITS) | (mi)) static inline dev_t old_decode_dev(u16 val) { 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, 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])); } else { 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)); |