c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 147475

Browse Source 
CID 147475: Logically dead code (DEADCODE)

Reviewed-by: Tim Chase <tim@chase2k.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: yuxiang <guo.yong33@zte.com.cn>
Closes #5421
This commit is contained in:
liaoyuxiangqin 2016-12-10 02:59:36 +08:00 committed by Brian Behlendorf
parent a806cb6a89
commit 00155d395f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libzfs/libzfs_diff.c
View File

@ -555,11 +555,13 @@ get_snapshot_names(differ_info_t *di, const char *fromsnap,
/* /*
* Can accept * Can accept
* dataset@snap1 * fdslen fsnlen tdslen tsnlen
* dataset@snap1 dataset@snap2 * dataset@snap1
* dataset@snap1 @snap2 * 0. dataset@snap1 dataset@snap2 >0 >1 >0 >1
* dataset@snap1 dataset * 1. dataset@snap1 @snap2 >0 >1 ==0 >1
* @snap1 dataset@snap2 * 2. dataset@snap1 dataset >0 >1 >0 ==0
* 3. @snap1 dataset@snap2 ==0 >1 >0 >1
* 4. @snap1 dataset ==0 >1 >0 ==0
*/ */
if (tosnap == NULL) { if (tosnap == NULL) {
/* only a from snapshot given, must be valid */ /* only a from snapshot given, must be valid */
@ -596,8 +598,7 @@ get_snapshot_names(differ_info_t *di, const char *fromsnap,
fsnlen = strlen(fromsnap) - fdslen; /* includes @ sign */ fsnlen = strlen(fromsnap) - fdslen; /* includes @ sign */
tsnlen = strlen(tosnap) - tdslen; /* includes @ sign */ tsnlen = strlen(tosnap) - tdslen; /* includes @ sign */
if (fsnlen <= 1 || tsnlen == 1 || (fdslen == 0 && tdslen == 0) || if (fsnlen <= 1 || tsnlen == 1 || (fdslen == 0 && tdslen == 0)) {
(fsnlen == 0 && tsnlen == 0)) {
return (zfs_error(hdl, EZFS_INVALIDNAME, di->errbuf)); return (zfs_error(hdl, EZFS_INVALIDNAME, di->errbuf));
} else if ((fdslen > 0 && tdslen > 0) && } else if ((fdslen > 0 && tdslen > 0) &&
((tdslen != fdslen || strncmp(fromsnap, tosnap, fdslen) != 0))) { ((tdslen != fdslen || strncmp(fromsnap, tosnap, fdslen) != 0))) {