diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 12:07:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 12:07:39 -0700 |
| commit | 5ba7026b4467b55fedddf73d093ef3322e8e5b52 (patch) | |
| tree | 6f0206c39fafc0441423517b490e3efd07f94645 /Documentation/filesystems | |
| parent | 45852766a0212c2d4f0d7faa71eedbd6c1d70452 (diff) | |
| parent | b1349f2536efcb592927ab6f8687c36c3c124f6b (diff) | |
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 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index e916e3d3648..0d049202808 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -114,7 +114,7 @@ members are defined: struct file_system_type { const char *name; int fs_flags; - struct dentry (*mount) (struct file_system_type *, int, + struct dentry *(*mount) (struct file_system_type *, int, const char *, void *); void (*kill_sb) (struct super_block *); struct module *owner; |