[PATCH 1/2] super-intel.c: Don't try to close negative fd

[PATCH 1/2] super-intel.c: Don't try to close negative fd

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

This should be harmless, but lets be consistent and not try to close a
negative file descripter.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 super-intel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/super-intel.c b/super-intel.c
index 2e85b6b..ca15703 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -4353,7 +4353,7 @@ static int get_super_block(struct intel_super **super_list, int devnum, char *de
 	} else {
 		if (s)
 			free(s);
-		if (dfd)
+		if (dfd >= 0)
 			close(dfd);
 	}
 	if ((dfd >= 0) && (!keep_fd))
-- 
1.7.7.6

[PATCH 2/2] super-intel.c: Fix resource leak from opendir()

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Use closedir() on dirp from opendir() to avoid resource leaking.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 super-intel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/super-intel.c b/super-intel.c
index ca15703..e2ed95a 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -5686,6 +5686,7 @@ get_devices(const char *hba_path)
 			free(dv);
 		}
 	}
+	closedir(dir);
 	return devlist;
 }
 
-- 
1.7.7.6

Re: [PATCH 1/2] super-intel.c: Don't try to close negative fd

[Dan Williams]

On Fri, May 4, 2012 at 6:41 AM,  <Jes.Sorensen@redhat.com> wrote:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>
> This should be harmless, but lets be consistent and not try to close a
> negative file descripter.
>
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---

Patch 1 and 2, Acked-by: Dan Williams <dan.j.williams@intel.com>

Re: [PATCH 1/2] super-intel.c: Don't try to close negative fd

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

On Fri, 4 May 2012 11:00:15 -0700 Dan Williams <dan.j.williams@intel.com>
wrote:

> On Fri, May 4, 2012 at 6:41 AM,  <Jes.Sorensen@redhat.com> wrote:
> > From: Jes Sorensen <Jes.Sorensen@redhat.com>
> >
> > This should be harmless, but lets be consistent and not try to close a
> > negative file descripter.
> >
> > Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> > ---
> 
> Patch 1 and 2, Acked-by: Dan Williams <dan.j.williams@intel.com>

Thanks to you both.
Patches applied.

NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]