summaryrefslogtreecommitdiff
path: root/drivers/dax
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-08 15:53:28 +0200
committerDan Williams <dan.j.williams@intel.com>2016-10-07 16:46:00 -0700
commitbc0a0fe94f33dd15edf2ed555bfc4d6dbb5e1995 (patch)
treeaa3eb59e99e9c566ec07936c46e5405fa6f7a4d6 /drivers/dax
parentd76911ee933a64c9dfc453e580e7ad612b394e83 (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>
Diffstat (limited to 'drivers/dax')
-rw-r--r--drivers/dax/dax.c4
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,
goto err_minor;
}
+ dev_t = MKDEV(MAJOR(dax_devt), minor);
+ dev = &dax_dev->dev;
dax_dev->inode = dax_inode_get(&dax_dev->cdev, dev_t);
if (!dax_dev->inode) {
rc = -ENOMEM;
@@ -605,8 +607,6 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
}
/* device_initialize() so cdev can reference kobj parent */
- dev_t = MKDEV(MAJOR(dax_devt), minor);
- dev = &dax_dev->dev;
device_initialize(dev);
cdev = &dax_dev->cdev;