Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix coverity defects 

Fix coverity defects:
coverity scan CID:147623, Type: Resource leak.
coverity scan CID:147622, Type: Resource leak.
reason: zpool_open zhp, but not zpool_close zhp. so resource leak.

coverity scan CID:147621, Type: Resource fd leak.
coverity scan CID:147620, Type: Resource fd leak.
reason: do_write do_read open file fd,but exception not close fd.

delete unuse definition DMU_OS_IS_L2COMPRESSIBLE.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Closes #5137
This commit is contained in:
cao 2016-09-21 08:45:45 +08:00 committed by Brian Behlendorf
parent d2a6f65cfb
commit 884385a0b2
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zinject/translate.c
View File

@ -474,6 +474,7 @@ translate_device(const char *pool, const char *device, err_type_t label_type,
if (tgt == NULL) { if (tgt == NULL) {
(void) fprintf(stderr, "cannot find device '%s' in " (void) fprintf(stderr, "cannot find device '%s' in "
"pool '%s'\n", device, pool); "pool '%s'\n", device, pool);
zpool_close(zhp);
return (-1); return (-1);
} }
@ -515,5 +516,6 @@ translate_device(const char *pool, const char *device, err_type_t label_type,
record->zi_end = record->zi_start + VDEV_PAD_SIZE - 1; record->zi_end = record->zi_start + VDEV_PAD_SIZE - 1;
break; break;
} }
zpool_close(zhp);
return (0); return (0);
} }

3
cmd/zpool/zpool_main.c
View File

@ -758,7 +758,7 @@ zpool_do_remove(int argc, char **argv)
{ {
char *poolname; char *poolname;
int i, ret = 0; int i, ret = 0;
zpool_handle_t *zhp; zpool_handle_t *zhp = NULL;
argc--; argc--;
argv++; argv++;
@ -782,6 +782,7 @@ zpool_do_remove(int argc, char **argv)
if (zpool_vdev_remove(zhp, argv[i]) != 0) if (zpool_vdev_remove(zhp, argv[i]) != 0)
ret = 1; ret = 1;
} }
zpool_close(zhp);
return (ret); return (ret);
} }

2
include/sys/dmu_objset.h
View File

@ -138,8 +138,6 @@ struct objset {
((os)->os_secondary_cache == ZFS_CACHE_ALL || \ ((os)->os_secondary_cache == ZFS_CACHE_ALL || \
(os)->os_secondary_cache == ZFS_CACHE_METADATA) (os)->os_secondary_cache == ZFS_CACHE_METADATA)
#define DMU_OS_IS_L2COMPRESSIBLE(os) (zfs_mdcomp_disable == B_FALSE)
/* called from zpl */ /* called from zpl */
int dmu_objset_hold(const char *name, void *tag, objset_t **osp); int dmu_objset_hold(const char *name, void *tag, objset_t **osp);
int dmu_objset_own(const char *name, dmu_objset_type_t type, int dmu_objset_own(const char *name, dmu_objset_type_t type,

2
tests/zfs-tests/tests/functional/ctime/ctime_001_pos.c
View File

@ -110,6 +110,7 @@ do_read(const char *pfile)
if (read(fd, buf, sizeof (buf)) == -1) { if (read(fd, buf, sizeof (buf)) == -1) {
(void) fprintf(stderr, "read(%d, buf, %zd) failed with errno " (void) fprintf(stderr, "read(%d, buf, %zd) failed with errno "
"%d\n", fd, sizeof (buf), errno); "%d\n", fd, sizeof (buf), errno);
(void) close(fd);
return (1); return (1);
} }
(void) close(fd); (void) close(fd);
@ -133,6 +134,7 @@ do_write(const char *pfile)
if (write(fd, buf, strlen(buf)) == -1) { if (write(fd, buf, strlen(buf)) == -1) {
(void) fprintf(stderr, "write(%d, buf, %d) failed with errno " (void) fprintf(stderr, "write(%d, buf, %d) failed with errno "
"%d\n", fd, (int)strlen(buf), errno); "%d\n", fd, (int)strlen(buf), errno);
(void) close(fd);
return (1); return (1);
} }
(void) close(fd); (void) close(fd);