summaryrefslogtreecommitdiffstats
path: root/discover/device-handler.c
diff options
context:
space:
mode:
authorSam Mendoza-Jonas <samjc.mj@gmail.com>2015-12-18 11:28:30 +1100
committerSam Mendoza-Jonas <samjc.mj@gmail.com>2015-12-18 11:28:30 +1100
commit45e9e7a53540e87e2129bb11fd853501131fb795 (patch)
treeba5ac78f859fc937e5e1e4ee98e3596fb4021c7a /discover/device-handler.c
parent0dae90626e54e46372c9feddc2f9ac82f046547d (diff)
parentf5d24f2a0727a23a6a4a888651aea4232aa6e32f (diff)
downloadtalos-petitboot-45e9e7a53540e87e2129bb11fd853501131fb795.tar.gz
talos-petitboot-45e9e7a53540e87e2129bb11fd853501131fb795.zip
Merge pull request #11 from open-power/coverity
Coverity fixes
Diffstat (limited to 'discover/device-handler.c')
-rw-r--r--discover/device-handler.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index bfe5fff..3804b34 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1472,7 +1472,6 @@ mount_ro:
void device_release_write(struct discover_device *dev, bool release)
{
const char *fstype, *device_path;
- int rc = 0;
if (!release)
return;
@@ -1495,10 +1494,9 @@ void device_release_write(struct discover_device *dev, bool release)
device_path = get_device_path(dev);
}
- mount(device_path, dev->mount_path, fstype,
+ if (mount(device_path, dev->mount_path, fstype,
MS_RDONLY | MS_SILENT,
- fs_parameters(dev, MS_RDONLY));
- if (rc)
+ fs_parameters(dev, MS_RDONLY)))
pb_log("Failed to remount %s read-only: %s\n",
device_path, strerror(errno));
else
OpenPOWER on IntegriCloud