The patch titled
JBD: memory leak in "journal_init_dev()"
has been added to the -mm tree. Its filename is
jbd-memory-leak-in-journal_init_dev.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: JBD: memory leak in "journal_init_dev()"
From: Zoltan Menyhart <Zoltan.Menyhart@xxxxxxxx>
We leak a bh ref in "journal_init_dev()" in case of failure.
Signed-off-by: Zoltan Menyhart <Zoltan.Menyhart@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/jbd/journal.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff -puN fs/jbd/journal.c~jbd-memory-leak-in-journal_init_dev fs/jbd/journal.c
--- a/fs/jbd/journal.c~jbd-memory-leak-in-journal_init_dev
+++ a/fs/jbd/journal.c
@@ -715,18 +715,8 @@ journal_t * journal_init_dev(struct bloc
if (!journal)
return NULL;
- journal->j_dev = bdev;
- journal->j_fs_dev = fs_dev;
- journal->j_blk_offset = start;
- journal->j_maxlen = len;
- journal->j_blocksize = blocksize;
-
- bh = __getblk(journal->j_dev, start, journal->j_blocksize);
- J_ASSERT(bh != NULL);
- journal->j_sb_buffer = bh;
- journal->j_superblock = (journal_superblock_t *)bh->b_data;
-
/* journal descriptor can store up to n blocks -bzzz */
+ journal->j_blocksize = blocksize;
n = journal->j_blocksize / sizeof(journal_block_tag_t);
journal->j_wbufsize = n;
journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
@@ -736,6 +726,15 @@ journal_t * journal_init_dev(struct bloc
kfree(journal);
journal = NULL;
}
+ journal->j_dev = bdev;
+ journal->j_fs_dev = fs_dev;
+ journal->j_blk_offset = start;
+ journal->j_maxlen = len;
+
+ bh = __getblk(journal->j_dev, start, journal->j_blocksize);
+ J_ASSERT(bh != NULL);
+ journal->j_sb_buffer = bh;
+ journal->j_superblock = (journal_superblock_t *)bh->b_data;
return journal;
}
_
Patches currently in -mm which might be from Zoltan.Menyhart@xxxxxxxx are
jbd-memory-leak-in-journal_init_dev.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
