From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Darrick J. Wong" Subject: Re: [PATCH 1/4] ext4: release buffer when checksum failed Date: Fri, 18 Jan 2013 13:28:38 -0800 Message-ID: <20130118212838.GO6426@blackbox.djwong.org> References: <1358496074-6228-1-git-send-email-yan@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: tytso@mit.edu, linux-ext4@vger.kernel.org To: Guo Chao Return-path: Received: from aserp1040.oracle.com ([141.146.126.69]:50804 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829Ab3ARVdC (ORCPT ); Fri, 18 Jan 2013 16:33:02 -0500 Content-Disposition: inline In-Reply-To: <1358496074-6228-1-git-send-email-yan@linux.vnet.ibm.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Fri, Jan 18, 2013 at 04:01:11PM +0800, Guo Chao wrote: > Commit b0336e8d (ext4: calculate and verify checksums of directory leaf > blocks) and commit dbe89444 (ext4: Calculate and verify checksums for > htree nodes) forget to release buffer when checksum failed, at some places. > > Cc: D. J. Wong > Signed-off-by: Guo Chao I think this looks ok... Reviewed-by: Darrick J. Wong > --- > fs/ext4/dir.c | 1 + > fs/ext4/namei.c | 12 ++++++++++-- > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c > index 80a28b2..3882fbc 100644 > --- a/fs/ext4/dir.c > +++ b/fs/ext4/dir.c > @@ -185,6 +185,7 @@ static int ext4_readdir(struct file *filp, > "at offset %llu", > (unsigned long long)filp->f_pos); > filp->f_pos += sb->s_blocksize - offset; > + brelse(bh); > continue; > } > set_buffer_verified(bh); > diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c > index 8990165..a445247 100644 > --- a/fs/ext4/namei.c > +++ b/fs/ext4/namei.c > @@ -837,6 +837,7 @@ static int ext4_htree_next_block(struct inode *dir, __u32 hash, > !ext4_dx_csum_verify(dir, > (struct ext4_dir_entry *)bh->b_data)) { > ext4_warning(dir->i_sb, "Node failed checksum"); > + brelse(bh); > return -EIO; > } > set_buffer_verified(bh); > @@ -877,8 +878,11 @@ static int htree_dirblock_to_tree(struct file *dir_file, > } > > if (!buffer_verified(bh) && > - !ext4_dirent_csum_verify(dir, (struct ext4_dir_entry *)bh->b_data)) > + !ext4_dirent_csum_verify(dir, > + (struct ext4_dir_entry *)bh->b_data)) { > + brelse(bh); > return -EIO; > + } > set_buffer_verified(bh); > > de = (struct ext4_dir_entry_2 *) bh->b_data; > @@ -1929,8 +1933,10 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, > } > if (!buffer_verified(bh) && > !ext4_dirent_csum_verify(dir, > - (struct ext4_dir_entry *)bh->b_data)) > + (struct ext4_dir_entry *)bh->b_data)) { > + brelse(bh); > return -EIO; > + } > set_buffer_verified(bh); > retval = add_dirent_to_buf(handle, dentry, inode, NULL, bh); > if (retval != -ENOSPC) { > @@ -2493,6 +2499,7 @@ static int empty_dir(struct inode *inode) > (struct ext4_dir_entry *)bh->b_data)) { > EXT4_ERROR_INODE(inode, "checksum error reading directory " > "lblock 0"); > + brelse(bh); > return -EIO; > } > set_buffer_verified(bh); > @@ -2537,6 +2544,7 @@ static int empty_dir(struct inode *inode) > (struct ext4_dir_entry *)bh->b_data)) { > EXT4_ERROR_INODE(inode, "checksum error " > "reading directory lblock 0"); > + brelse(bh); > return -EIO; > } > set_buffer_verified(bh); > -- > 1.7.9.5 >