From: Curt Wohlgemuth <curtw@google.com>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: ext4 development <linux-ext4@vger.kernel.org>
Subject: Re: [PATCH] ext4: More buffer head reference leaks
Date: Wed, 15 Jul 2009 08:53:12 -0700 [thread overview]
Message-ID: <6601abe90907150853m73654d6dlfbdb47eb26e7d498@mail.gmail.com> (raw)
In-Reply-To: <6601abe90907150800m4924e35fi13dd4eea6fe7f327@mail.gmail.com>
I've cleaned up the patch to
- fix the comment in ext4_alloc_branch()
- change ext4_add_entry() to remove the gotos and label
Signed-off-by: Curt Wohlgemuth <curtw@google.com>
---
diff -Naur orig/fs/ext4/inode.c new/fs/ext4/inode.c
--- orig/fs/ext4/inode.c 2009-07-14 11:19:01.000000000 -0700
+++ new/fs/ext4/inode.c 2009-07-15 08:12:15.000000000 -0700
@@ -758,8 +758,9 @@
BUFFER_TRACE(bh, "call get_create_access");
err = ext4_journal_get_create_access(handle, bh);
if (err) {
+ /* Don't brelse(bh) here; it's done in
+ * ext4_journal_forget() below */
unlock_buffer(bh);
- brelse(bh);
goto failed;
}
diff -Naur orig/fs/ext4/namei.c new/fs/ext4/namei.c
--- orig/fs/ext4/namei.c 2009-07-14 11:19:46.000000000 -0700
+++ new/fs/ext4/namei.c 2009-07-15 08:12:09.000000000 -0700
@@ -1518,8 +1518,12 @@
return retval;
if (blocks == 1 && !dx_fallback &&
- EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX))
- return make_indexed_dir(handle, dentry, inode, bh);
+ EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX)) {
+ retval = make_indexed_dir(handle, dentry, inode, bh);
+ if (retval == -ENOSPC)
+ brelse(bh);
+ return retval;
+ }
brelse(bh);
}
bh = ext4_append(handle, dir, &block, &retval);
@@ -1528,7 +1532,10 @@
de = (struct ext4_dir_entry_2 *) bh->b_data;
de->inode = 0;
de->rec_len = ext4_rec_len_to_disk(blocksize, blocksize);
- return add_dirent_to_buf(handle, dentry, inode, de, bh);
+ retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
+ if (retval == -ENOSPC)
+ brelse(bh);
+ return retval;
}
/*
@@ -1657,7 +1664,8 @@
if (!de)
goto cleanup;
err = add_dirent_to_buf(handle, dentry, inode, de, bh);
- bh = NULL;
+ if (err != -ENOSPC)
+ bh = NULL;
goto cleanup;
journal_error:
next prev parent reply other threads:[~2009-07-15 15:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-14 20:58 [PATCH] ext4: More buffer head reference leaks Curt Wohlgemuth
2009-07-15 5:52 ` Aneesh Kumar K.V
2009-07-15 15:00 ` Curt Wohlgemuth
2009-07-15 15:53 ` Curt Wohlgemuth [this message]
2009-07-17 19:55 ` Curt Wohlgemuth
2009-07-17 22:19 ` Theodore Tso
2009-07-15 6:23 ` Aneesh Kumar K.V
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6601abe90907150853m73654d6dlfbdb47eb26e7d498@mail.gmail.com \
--to=curtw@google.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).