| Message ID | 1457637535-21633-2-git-send-email-jack@suse.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e4b274915863 |
| Headers | show |
On Thu, Mar 10, 2016 at 08:18:44PM +0100, Jan Kara wrote: > From: NeilBrown <neilb@suse.com> > > 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. > > Signed-off-by: NeilBrown <neilb@suse.com> > Signed-off-by: Jan Kara <jack@suse.cz> Acked-by: Ross Zwisler <ross.zwisler@linux.intel.com> > --- > fs/dax.c | 9 +++++++++ > include/linux/radix-tree.h | 9 --------- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/fs/dax.c b/fs/dax.c > index 711172450da6..9c4d697fb6fc 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -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; > diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h > index f54be7082207..968150ab8a1c 100644 > --- a/include/linux/radix-tree.h > +++ b/include/linux/radix-tree.h > @@ -51,15 +51,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); > -- > 2.6.2 >
diff --git a/fs/dax.c b/fs/dax.c index 711172450da6..9c4d697fb6fc 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -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; diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h index f54be7082207..968150ab8a1c 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -51,15 +51,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);