diff options
| author | Steven Whitehouse | 2006-07-17 15:25:26 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2006-07-17 15:25:26 +0200 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /Documentation/filesystems | |
| parent | [DLM] dlm: user locks (diff) | |
| parent | Linux 2.6.18-rc2 (diff) | |
| download | kernel-qcow2-linux-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.tar.gz kernel-qcow2-linux-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.tar.xz kernel-qcow2-linux-4bf311ddfbffe12d41ad1a3c311ab727db6f72cb.zip | |
Merge branch 'master'
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/Locking | 4 | ||||
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index d31efbbdfe50..247d7f619aa2 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -142,8 +142,8 @@ see also dquot_operations section. --------------------------- file_system_type --------------------------- prototypes: - struct int (*get_sb) (struct file_system_type *, int, - const char *, void *, struct vfsmount *); + int (*get_sb) (struct file_system_type *, int, + const char *, void *, struct vfsmount *); void (*kill_sb) (struct super_block *); locking rules: may block BKL diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 9d3aed628bc1..1cb7e8be927a 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -113,8 +113,8 @@ members are defined: struct file_system_type { const char *name; int fs_flags; - struct int (*get_sb) (struct file_system_type *, int, - const char *, void *, struct vfsmount *); + int (*get_sb) (struct file_system_type *, int, + const char *, void *, struct vfsmount *); void (*kill_sb) (struct super_block *); struct module *owner; struct file_system_type * next; |