Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4b27491 authored by NeilBrown's avatar NeilBrown Committed by Vishal Verma
Browse files

DAX: move RADIX_DAX_ definitions to dax.c 



These don't belong in radix-tree.c any more than PAGECACHE_TAG_* do.
Let's try to maintain the idea that radix-tree simply implements an
abstract data type.

Acked-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
parent 12735f88

fs/dax.c

+9 −0
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ 
#include <linux/pfn_t.h>

#include <linux/sizes.h>



#define RADIX_DAX_MASK	0xf

#define RADIX_DAX_SHIFT	4

#define RADIX_DAX_PTE  (0x4 | RADIX_TREE_EXCEPTIONAL_ENTRY)

#define RADIX_DAX_PMD  (0x8 | RADIX_TREE_EXCEPTIONAL_ENTRY)

#define RADIX_DAX_TYPE(entry) ((unsigned long)entry & RADIX_DAX_MASK)

#define RADIX_DAX_SECTOR(entry) (((unsigned long)entry >> RADIX_DAX_SHIFT))

#define RADIX_DAX_ENTRY(sector, pmd) ((void *)((unsigned long)sector << \

		RADIX_DAX_SHIFT | (pmd ? RADIX_DAX_PMD : RADIX_DAX_PTE)))



static long dax_map_atomic(struct block_device *bdev, struct blk_dax_ctl *dax)

{

	struct request_queue *q = bdev->bd_queue;

include/linux/radix-tree.h

+0 −9
Original line number Diff line number Diff line
@@ -52,15 +52,6 @@ 
#define RADIX_TREE_EXCEPTIONAL_ENTRY	2

#define RADIX_TREE_EXCEPTIONAL_SHIFT	2



#define RADIX_DAX_MASK	0xf

#define RADIX_DAX_SHIFT	4

#define RADIX_DAX_PTE  (0x4 | RADIX_TREE_EXCEPTIONAL_ENTRY)

#define RADIX_DAX_PMD  (0x8 | RADIX_TREE_EXCEPTIONAL_ENTRY)

#define RADIX_DAX_TYPE(entry) ((unsigned long)entry & RADIX_DAX_MASK)

#define RADIX_DAX_SECTOR(entry) (((unsigned long)entry >> RADIX_DAX_SHIFT))

#define RADIX_DAX_ENTRY(sector, pmd) ((void *)((unsigned long)sector << \

		RADIX_DAX_SHIFT | (pmd ? RADIX_DAX_PMD : RADIX_DAX_PTE)))



static inline int radix_tree_is_indirect_ptr(void *ptr)

{

	return (int)((unsigned long)ptr & RADIX_TREE_INDIRECT_PTR);