Merge tag 'for-torvalds-20120418' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / Documentation / filesystems / vfs.txt

diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 3d9393b845b8f71095dd2b55a1bd601ef70c37cd..0d0492028082c0ecda1a0931cc5100765624a80a 100644 (file)
--- 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;
@@ -993,7 +993,7 @@ struct dentry_operations {
 
        If the 'rcu_walk' parameter is true, then the caller is doing a
        pathwalk in RCU-walk mode.  Sleeping is not permitted in this mode,
-       and the caller can be asked to leave it and call again by returing
+       and the caller can be asked to leave it and call again by returning
        -ECHILD.
 
        This function is only used if DCACHE_MANAGE_TRANSIT is set on the