[Xen-changelog] [xen-unstable] [LIBFSIMAGE] Don't leak FDs or RAM when closing filesystems

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Node ID ac10e3047f3657942f7d3d3bbf2b982de5d17b01
# Parent  5a4517468f4f7341eef9d20d4959187a7f2f2267
[LIBFSIMAGE] Don't leak FDs or RAM when closing filesystems
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
 tools/libfsimage/common/fsimage.c      |    2 ++
 tools/libfsimage/common/fsimage_grub.c |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff -r 5a4517468f4f -r ac10e3047f36 tools/libfsimage/common/fsimage.c
--- a/tools/libfsimage/common/fsimage.c Fri Nov 10 11:01:15 2006 +0000
+++ b/tools/libfsimage/common/fsimage.c Fri Nov 10 12:27:56 2006 +0000
@@ -72,6 +72,8 @@ void fsi_close_fsimage(fsi_t *fsi)
 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 -r 5a4517468f4f -r ac10e3047f36 tools/libfsimage/common/fsimage_grub.c
--- a/tools/libfsimage/common/fsimage_grub.c    Fri Nov 10 11:01:15 2006 +0000
+++ b/tools/libfsimage/common/fsimage_grub.c    Fri Nov 10 12:27:56 2006 +0000
@@ -193,7 +193,6 @@ static int
 static int
 fsig_umount(fsi_t *fsi)
 {
-       fsip_fs_free(fsi);
        return (0);
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog