diff options
| author | Dan Williams | 2017-05-05 08:38:43 +0200 |
|---|---|---|
| committer | Dan Williams | 2017-05-05 08:38:43 +0200 |
| commit | 736163671bcb163fc82600b46c83dfa89d532d95 (patch) | |
| tree | 0639dc9d9fa180450b4e8fbda706eaae5f1876da /drivers/dax/dax-private.h | |
| parent | libnvdimm, pfn: fix 'npfns' vs section alignment (diff) | |
| parent | brd: fix uninitialized use of brd->dax_dev (diff) | |
| download | kernel-qcow2-linux-736163671bcb163fc82600b46c83dfa89d532d95.tar.gz kernel-qcow2-linux-736163671bcb163fc82600b46c83dfa89d532d95.tar.xz kernel-qcow2-linux-736163671bcb163fc82600b46c83dfa89d532d95.zip | |
Merge branch 'for-4.12/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/dax/dax-private.h')
| -rw-r--r-- | drivers/dax/dax-private.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/dax/dax-private.h b/drivers/dax/dax-private.h index b1cd7a8e5ab9..b6fc4f04636d 100644 --- a/drivers/dax/dax-private.h +++ b/drivers/dax/dax-private.h @@ -38,22 +38,18 @@ struct dax_region { }; /** - * struct dax_dev - subdivision of a dax region + * struct dev_dax - instance data for a subdivision of a dax region * @region - parent region - * @inode - inode - * @dev - device backing the character device - * @cdev - core chardev data - * @alive - !alive + srcu grace period == no new mappings can be established + * @dax_dev - core dax functionality + * @dev - device core * @id - child id in the region * @num_resources - number of physical address extents in this device * @res - array of physical address ranges */ -struct dax_dev { +struct dev_dax { struct dax_region *region; - struct inode *inode; + struct dax_device *dax_dev; struct device dev; - struct cdev cdev; - bool alive; int id; int num_resources; struct resource res[0]; |