From: Jan Kara <jack@suse.cz> To: linux-fsdevel@vger.kernel.org Cc: Jan Kara <jack@suse.cz>, linux-nvdimm@lists.01.org, NeilBrown <neilb@suse.com>, linux-mm@kvack.org, linux-ext4@vger.kernel.org Subject: [PATCH 03/18] DAX: move RADIX_DAX_ definitions to dax.c Date: Mon, 18 Apr 2016 23:35:26 +0200 [thread overview] Message-ID: <1461015341-20153-4-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1461015341-20153-1-git-send-email-jack@suse.cz> 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. Acked-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Jan Kara <jack@suse.cz> --- 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 75ba46d82a76..08799a510b4d 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 51a97ac8bfbf..d08d6ec3bf53 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -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); -- 2.6.6 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: linux-fsdevel@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-mm@kvack.org, Ross Zwisler <ross.zwisler@linux.intel.com>, Dan Williams <dan.j.williams@intel.com>, linux-nvdimm@lists.01.org, Matthew Wilcox <willy@linux.intel.com>, NeilBrown <neilb@suse.com>, Jan Kara <jack@suse.cz> Subject: [PATCH 03/18] DAX: move RADIX_DAX_ definitions to dax.c Date: Mon, 18 Apr 2016 23:35:26 +0200 [thread overview] Message-ID: <1461015341-20153-4-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1461015341-20153-1-git-send-email-jack@suse.cz> 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. Acked-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Jan Kara <jack@suse.cz> --- 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 75ba46d82a76..08799a510b4d 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 51a97ac8bfbf..d08d6ec3bf53 100644 --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -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); -- 2.6.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-04-18 21:35 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-18 21:35 [RFC v3] [PATCH 0/18] DAX page fault locking Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 01/18] ext4: Handle transient ENOSPC properly for DAX Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 02/18] ext4: Fix race in transient ENOSPC detection Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara [this message] 2016-04-18 21:35 ` [PATCH 03/18] DAX: move RADIX_DAX_ definitions to dax.c Jan Kara 2016-04-18 21:35 ` [PATCH 04/18] dax: Remove complete_unwritten argument Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 05/18] ext2: Avoid DAX zeroing to corrupt data Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 16:30 ` Ross Zwisler 2016-04-29 16:30 ` Ross Zwisler 2016-04-29 16:30 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 06/18] dax: Remove dead zeroing code from fault handlers Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 16:48 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 07/18] ext4: Refactor direct IO code Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 08/18] ext4: Pre-zero allocated blocks for DAX IO Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 18:01 ` Ross Zwisler 2016-04-29 18:01 ` Ross Zwisler 2016-04-29 18:01 ` Ross Zwisler 2016-05-02 13:09 ` Jan Kara 2016-05-02 13:09 ` Jan Kara 2016-04-18 21:35 ` [PATCH 09/18] dax: Remove zeroing from dax_io() Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 18:56 ` Ross Zwisler 2016-04-29 18:56 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 10/18] dax: Remove pointless writeback from dax_do_io() Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 19:00 ` Ross Zwisler 2016-04-29 19:00 ` Ross Zwisler 2016-04-29 19:00 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 11/18] dax: Fix condition for filling of PMD holes Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 19:08 ` Ross Zwisler 2016-04-29 19:08 ` Ross Zwisler 2016-04-29 19:08 ` Ross Zwisler 2016-05-02 13:16 ` Jan Kara 2016-05-02 13:16 ` Jan Kara 2016-04-18 21:35 ` [PATCH 12/18] dax: Remove redundant inode size checks Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 13/18] dax: Make huge page handling depend of CONFIG_BROKEN Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 19:53 ` Ross Zwisler 2016-04-29 19:53 ` Ross Zwisler 2016-05-02 13:19 ` Jan Kara 2016-05-02 13:19 ` Jan Kara 2016-05-02 13:19 ` Jan Kara 2016-04-18 21:35 ` [PATCH 14/18] dax: Define DAX lock bit for radix tree exceptional entry Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 20:03 ` Ross Zwisler 2016-04-29 20:03 ` Ross Zwisler 2016-04-29 20:03 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 15/18] dax: Allow DAX code to replace exceptional entries Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 20:29 ` Ross Zwisler 2016-04-29 20:29 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 16/18] dax: New fault locking Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-27 4:27 ` NeilBrown 2016-04-27 4:27 ` NeilBrown 2016-05-06 4:13 ` Ross Zwisler 2016-05-06 4:13 ` Ross Zwisler 2016-05-06 4:13 ` Ross Zwisler 2016-05-10 12:27 ` Jan Kara 2016-05-10 12:27 ` Jan Kara 2016-05-11 19:26 ` Ross Zwisler 2016-05-11 19:26 ` Ross Zwisler 2016-05-12 7:58 ` Jan Kara 2016-05-12 7:58 ` Jan Kara 2016-04-18 21:35 ` [PATCH 17/18] dax: Use radix tree entry lock to protect cow faults Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-19 11:46 ` Jerome Glisse 2016-04-19 11:46 ` Jerome Glisse 2016-04-19 11:46 ` Jerome Glisse 2016-04-19 14:33 ` Jan Kara 2016-04-19 14:33 ` Jan Kara 2016-04-19 14:33 ` Jan Kara 2016-04-19 15:19 ` Jerome Glisse 2016-04-19 15:19 ` Jerome Glisse 2016-04-19 15:19 ` Jerome Glisse 2016-04-19 15:19 ` Jerome Glisse 2016-04-18 21:35 ` [PATCH 18/18] dax: Remove i_mmap_lock protection Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-05-06 3:35 ` [RFC v3] [PATCH 0/18] DAX page fault locking Ross Zwisler 2016-05-06 3:35 ` Ross Zwisler 2016-05-06 20:33 ` Ross Zwisler 2016-05-06 20:33 ` Ross Zwisler 2016-05-09 9:38 ` Jan Kara 2016-05-09 9:38 ` Jan Kara 2016-05-09 9:38 ` Jan Kara 2016-05-10 15:28 ` Jan Kara 2016-05-10 15:28 ` Jan Kara 2016-05-10 15:28 ` Jan Kara 2016-05-10 20:30 ` Ross Zwisler 2016-05-10 20:30 ` Ross Zwisler 2016-05-10 20:30 ` Ross Zwisler 2016-05-10 22:39 ` Ross Zwisler 2016-05-10 22:39 ` Ross Zwisler 2016-05-11 9:19 ` Jan Kara 2016-05-11 9:19 ` Jan Kara 2016-05-11 9:19 ` Jan Kara 2016-05-11 15:52 ` Ross Zwisler 2016-05-11 15:52 ` Ross Zwisler 2016-05-11 15:52 ` Ross Zwisler 2016-05-09 21:28 ` Verma, Vishal L 2016-05-10 11:52 ` Jan Kara 2016-05-10 11:52 ` Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1461015341-20153-4-git-send-email-jack@suse.cz \ --to=jack@suse.cz \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=neilb@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.