diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-08 09:53:28 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-10-07 19:46:00 -0400 |
| commit | bc0a0fe94f33dd15edf2ed555bfc4d6dbb5e1995 (patch) | |
| tree | aa3eb59e99e9c566ec07936c46e5405fa6f7a4d6 | |
| parent | d76911ee933a64c9dfc453e580e7ad612b394e83 (diff) | |
dax: use correct dev_t value
The dev_t variable in devm_create_dax_dev() is used before it's
first set:
drivers/dax/dax.c: In function 'devm_create_dax_dev':
drivers/dax/dax.c:205:39: error: 'dev_t' may be used uninitialized in this function [-Werror=maybe-uninitialized]
inode = iget5_locked(dax_superblock, hash_32(devt + DAXFS_MAGIC, 31),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/dax/dax.c:688:8: note: 'dev_t' was declared here
This reorders the code to how it looks correct to me.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 3bc52c45bac2 ("dax: define a unified inode/address_space for device-dax mappings")
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
| -rw-r--r-- | drivers/dax/dax.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dax/dax.c b/drivers/dax/dax.c index e7d8a3902437..b917e4d66ad0 100644 --- a/drivers/dax/dax.c +++ b/drivers/dax/dax.c | |||
| @@ -598,6 +598,8 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, | |||
| 598 | goto err_minor; | 598 | goto err_minor; |
| 599 | } | 599 | } |
| 600 | 600 | ||
| 601 | dev_t = MKDEV(MAJOR(dax_devt), minor); | ||
| 602 | dev = &dax_dev->dev; | ||
| 601 | dax_dev->inode = dax_inode_get(&dax_dev->cdev, dev_t); | 603 | dax_dev->inode = dax_inode_get(&dax_dev->cdev, dev_t); |
| 602 | if (!dax_dev->inode) { | 604 | if (!dax_dev->inode) { |
| 603 | rc = -ENOMEM; | 605 | rc = -ENOMEM; |
| @@ -605,8 +607,6 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, | |||
| 605 | } | 607 | } |
| 606 | 608 | ||
| 607 | /* device_initialize() so cdev can reference kobj parent */ | 609 | /* device_initialize() so cdev can reference kobj parent */ |
| 608 | dev_t = MKDEV(MAJOR(dax_devt), minor); | ||
| 609 | dev = &dax_dev->dev; | ||
| 610 | device_initialize(dev); | 610 | device_initialize(dev); |
| 611 | 611 | ||
| 612 | cdev = &dax_dev->cdev; | 612 | cdev = &dax_dev->cdev; |
