diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /Documentation/filesystems | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
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. | |||
| 142 | 142 | ||
| 143 | --------------------------- file_system_type --------------------------- | 143 | --------------------------- file_system_type --------------------------- |
| 144 | prototypes: | 144 | prototypes: |
| 145 | struct int (*get_sb) (struct file_system_type *, int, | 145 | int (*get_sb) (struct file_system_type *, int, |
| 146 | const char *, void *, struct vfsmount *); | 146 | const char *, void *, struct vfsmount *); |
| 147 | void (*kill_sb) (struct super_block *); | 147 | void (*kill_sb) (struct super_block *); |
| 148 | locking rules: | 148 | locking rules: |
| 149 | may block BKL | 149 | 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: | |||
| 113 | struct file_system_type { | 113 | struct file_system_type { |
| 114 | const char *name; | 114 | const char *name; |
| 115 | int fs_flags; | 115 | int fs_flags; |
| 116 | struct int (*get_sb) (struct file_system_type *, int, | 116 | int (*get_sb) (struct file_system_type *, int, |
| 117 | const char *, void *, struct vfsmount *); | 117 | const char *, void *, struct vfsmount *); |
| 118 | void (*kill_sb) (struct super_block *); | 118 | void (*kill_sb) (struct super_block *); |
| 119 | struct module *owner; | 119 | struct module *owner; |
| 120 | struct file_system_type * next; | 120 | struct file_system_type * next; |