summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 14:01:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-07 14:01:50 -0700
commit4848d7156943085c0d4ca0b0575474af25673699 (patch)
treec6e81118a29ff29f6e88a4530cdabe9e9a1a6432 /fs
parent4eab8a5717f5a863cb0e2fc8b22d8b22f4aaa644 (diff)
parent4afc31345e5f543e5d89a47aeadaaad1d91a5bc8 (diff)
downloadlinux-3.10-4848d7156943085c0d4ca0b0575474af25673699.tar.gz
linux-3.10-4848d7156943085c0d4ca0b0575474af25673699.tar.bz2
linux-3.10-4848d7156943085c0d4ca0b0575474af25673699.zip
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 leak of shadow dat inode in error path of load_nilfs
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/the_nilfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
index 4317f177ea7..ba7c10c917f 100644
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@ -446,6 +446,7 @@ int load_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi)
nilfs_mdt_destroy(nilfs->ns_cpfile);
nilfs_mdt_destroy(nilfs->ns_sufile);
nilfs_mdt_destroy(nilfs->ns_dat);
+ nilfs_mdt_destroy(nilfs->ns_gc_dat);
failed:
nilfs_clear_recovery_info(&ri);