From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Sat, 26 Sep 2015 19:44:40 +0000 (-0500)
Subject: coverity: drop second (redundant) block
X-Git-Tag: lxc-2.0.0.beta1~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7c8805c1027e96c3af644652128da32c105c5b3;p=thirdparty%2Flxc.git

coverity: drop second (redundant) block

Don't proceed to try the mount if we failed to create the
target if it didn't exist.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 0913b22f5..1b7179540 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1849,9 +1849,6 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
 	if (ret < 0)
 		return optional ? 0 : -1;
 
-	if (ret < 0 && !optional)
-		return -1;
-
 	cull_mntent_opt(mntent);
 
 	if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {