LU-4048 build: fix 'control flow' errors

Fix "control flow" issues found by Coverity version 6.6.1:
Logically dead code (DEADCODE)
Execution cannot reach this statement.

Signed-off-by: Sebastien Buisson <sebastien.buisson@bull.net>
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I0be1b0f69b16a988e361185f6c4ef2d9dcee8d31
Reviewed-on: http://review.whamcloud.com/7824
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c
index f945dc4..85de89f 100644 (file)
--- a/lustre/lov/lov_io.c
+++ b/lustre/lov/lov_io.c
@@ -1110,6 +1110,8 @@ int lov_io_init_released(const struct lu_env *env, struct cl_object *obj,
        switch (io->ci_type) {
        default:
                LASSERTF(0, "invalid type %d\n", io->ci_type);
+               result = -EOPNOTSUPP;
+               break;
        case CIT_MISC:
        case CIT_FSYNC:
        case CIT_LADVISE:
@@ -1135,6 +1137,7 @@ int lov_io_init_released(const struct lu_env *env, struct cl_object *obj,
                result = -ENODATA;
                break;
        }
+
        if (result == 0) {
                cl_io_slice_add(io, &lio->lis_cl, obj, &lov_empty_io_ops);
                atomic_inc(&lov->lo_active_ios);

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index f9cb376..22e0e8d 100644 (file)
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -114,7 +114,8 @@ int class_dentry_readdir(const struct lu_env *env,
 next:
                rc = iops->next(env, it);
        } while (rc == 0);
-       rc = 0;
+       if (rc > 0)
+               rc = 0;
 
        iops->put(env, it);