diff options
| author | Axel Lin <axel.lin@ingics.com> | 2015-09-16 21:24:47 +0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-09-17 11:37:16 -0400 |
| commit | 4be9c1fc3df9c3b03c9bde8aec5e44fc73996a3f (patch) | |
| tree | 24c9a7e3ff38245a06f6107fdc1f247e760165ba /drivers/nvdimm | |
| parent | f0b2e563bc419df7c1b3d2f494574c25125f6aed (diff) | |
| download | linux-4be9c1fc3df9c3b03c9bde8aec5e44fc73996a3f.tar.bz2 | |
libnvdimm: btt_devs: Fix locking in namespace_store
Always take device_lock() before nvdimm_bus_lock() to prevent deadlock.
Cc: <stable@vger.kernel.org>
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm')
| -rw-r--r-- | drivers/nvdimm/btt_devs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c index 59ad54a63d9f..cb477518dd0e 100644 --- a/drivers/nvdimm/btt_devs.c +++ b/drivers/nvdimm/btt_devs.c @@ -128,13 +128,13 @@ static ssize_t namespace_store(struct device *dev, struct nd_btt *nd_btt = to_nd_btt(dev); ssize_t rc; - nvdimm_bus_lock(dev); device_lock(dev); + nvdimm_bus_lock(dev); rc = nd_namespace_store(dev, &nd_btt->ndns, buf, len); dev_dbg(dev, "%s: result: %zd wrote: %s%s", __func__, rc, buf, buf[len - 1] == '\n' ? "" : "\n"); - device_unlock(dev); nvdimm_bus_unlock(dev); + device_unlock(dev); return rc; } |