summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-30 08:04:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-30 08:04:15 -0700
commitb4566ac52484a5eef1d73e310f28235cd1b0685a (patch)
treeb49c6ee4973801b96751fcda97d7df68f4afafaf
parent3b798a5231be15411225b99dc1217580e8d6ae1f (diff)
parent62013ab5d5df297a01ae5863b5c26d758ec0af7f (diff)
downloadop-kernel-dev-b4566ac52484a5eef1d73e310f28235cd1b0685a.zip
op-kernel-dev-b4566ac52484a5eef1d73e310f28235cd1b0685a.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix bh leak in nilfs_cpfile_delete_checkpoints function
-rw-r--r--fs/nilfs2/cpfile.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
index e90b60d..300f1cd 100644
--- a/fs/nilfs2/cpfile.c
+++ b/fs/nilfs2/cpfile.c
@@ -311,7 +311,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &cp_bh);
if (ret < 0) {
if (ret != -ENOENT)
- goto out_sem;
+ goto out_header;
/* skip hole */
ret = 0;
continue;
@@ -344,7 +344,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
continue;
printk(KERN_ERR "%s: cannot delete block\n",
__func__);
- goto out_sem;
+ goto out_header;
}
}
@@ -361,6 +361,8 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
nilfs_mdt_mark_dirty(cpfile);
kunmap_atomic(kaddr, KM_USER0);
}
+
+ out_header:
brelse(header_bh);
out_sem:
OpenPOWER on IntegriCloud