From b828932c1430bfc62d7c3c83fec8e4a79ca4dbe6 Mon Sep 17 00:00:00 2001 From: Nandaja Varma Date: Thu, 5 Feb 2015 13:37:37 +0530 Subject: bd: coverity fixes, removing logically dead code and correcting checks Coverity CIDs: 1128910 1128911 1128913 1128912 1134020 Change-Id: I2d871723fbfe43f9ff6b3beba7a99b0d81d4aff5 BUG: 789278 Signed-off-by: Nandaja Varma Reviewed-on: http://review.gluster.org/9588 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/storage/bd/src/bd-helper.c | 5 +++-- xlators/storage/bd/src/bd.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'xlators/storage') diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c index 1b1c35bad51..5ca1ef79400 100644 --- a/xlators/storage/bd/src/bd-helper.c +++ b/xlators/storage/bd/src/bd-helper.c @@ -272,7 +272,8 @@ __bd_fd_ctx_get (xlator_t *this, fd_t *fd, bd_fd_t **bdfd_p) out: GF_FREE (devpath); if (ret) { - close (_fd); + if (_fd >= 0) + close (_fd); GF_FREE (bdfd); } return ret; @@ -905,7 +906,7 @@ bd_do_ioctl_zerofill (bd_priv_t *priv, bd_attr_t *bdatt, int fd, char *vg, uuid_utoa_r (bdatt->iatt.ia_gfid, uuid); sprintf (lvname, "/dev/%s/%s", vg, uuid); - readlink (lvname, dmname, sizeof (dmname)); + readlink (lvname, dmname, sizeof (dmname) - 1); p = strrchr (dmname, '/'); if (p) diff --git a/xlators/storage/bd/src/bd.c b/xlators/storage/bd/src/bd.c index 6ea18e7787b..85372f072ed 100644 --- a/xlators/storage/bd/src/bd.c +++ b/xlators/storage/bd/src/bd.c @@ -693,7 +693,8 @@ out: GF_FREE (devpath); if (ret) { - close (_fd); + if (_fd >= 0) + close (_fd); GF_FREE (bd_fd); } -- cgit