From: Tim Deegan <Tim.Deegan@xensource.com>
Date: Fri, 10 Nov 2006 12:27:56 +0000 (+0000)
Subject: [LIBFSIMAGE] Don't leak FDs or RAM when closing filesystems
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15567^2~6^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9c84d2db33251cbe5674113d8af7185d747de386;p=xen.git

[LIBFSIMAGE] Don't leak FDs or RAM when closing filesystems
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
---

diff --git a/tools/libfsimage/common/fsimage.c b/tools/libfsimage/common/fsimage.c
index f77d73b815..a326fd7644 100644
--- a/tools/libfsimage/common/fsimage.c
+++ b/tools/libfsimage/common/fsimage.c
@@ -72,6 +72,8 @@ fail:
 void fsi_close_fsimage(fsi_t *fsi)
 {
 	pthread_mutex_lock(&fsi_lock);
+        fsi->f_plugin->fp_ops->fpo_umount(fsi);
+        (void) close(fsi->f_fd);
 	fsip_fs_free(fsi);
 	pthread_mutex_unlock(&fsi_lock);
 }
diff --git a/tools/libfsimage/common/fsimage_grub.c b/tools/libfsimage/common/fsimage_grub.c
index 6f3f290634..f8c3839328 100644
--- a/tools/libfsimage/common/fsimage_grub.c
+++ b/tools/libfsimage/common/fsimage_grub.c
@@ -193,7 +193,6 @@ fsig_mount(fsi_t *fsi, const char *path)
 static int
 fsig_umount(fsi_t *fsi)
 {
-	fsip_fs_free(fsi);
 	return (0);
 }