summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-12 23:07:39 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-12 23:07:39 +0400
commit5ba7026b4467b55fedddf73d093ef3322e8e5b52 (patch)
tree6f0206c39fafc0441423517b490e3efd07f94645 /fs
parent45852766a0212c2d4f0d7faa71eedbd6c1d70452 (diff)
parentb1349f2536efcb592927ab6f8687c36c3c124f6b (diff)
downloadlinux-5ba7026b4467b55fedddf73d093ef3322e8e5b52.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "Regression fix in mtdchar_open(), fix for a really old leak (almost never hit in practice - it's a b0rken failure exit in simple_fill_super()) and a typo fix in vfs.txt (misspelled method type)." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: typo fix in Documentation/filesystems/vfs.txt dentry leak in simple_fill_super() failure exit fix breakage in mtdchar_open(), sanitize failure exits
Diffstat (limited to 'fs')
-rw-r--r--fs/libfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/libfs.c b/fs/libfs.c
index 358094f0433d..18d08f5db53a 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -529,6 +529,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic,
return 0;
out:
d_genocide(root);
+ shrink_dcache_parent(root);
dput(root);
return -ENOMEM;
}