diff options
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/Locking | 6 | ||||
-rw-r--r-- | Documentation/filesystems/hpfs.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/ntfs.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/proc.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/relay.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/xip.txt | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 59c14159cc47..d866551be037 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -54,7 +54,7 @@ ata *); | |||
54 | 54 | ||
55 | locking rules: | 55 | locking rules: |
56 | all may block, none have BKL | 56 | all may block, none have BKL |
57 | i_sem(inode) | 57 | i_mutex(inode) |
58 | lookup: yes | 58 | lookup: yes |
59 | create: yes | 59 | create: yes |
60 | link: yes (both) | 60 | link: yes (both) |
@@ -74,7 +74,7 @@ setxattr: yes | |||
74 | getxattr: no | 74 | getxattr: no |
75 | listxattr: no | 75 | listxattr: no |
76 | removexattr: yes | 76 | removexattr: yes |
77 | Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_sem on | 77 | Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on |
78 | victim. | 78 | victim. |
79 | cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem. | 79 | cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem. |
80 | ->truncate() is never called directly - it's a callback, not a | 80 | ->truncate() is never called directly - it's a callback, not a |
@@ -461,7 +461,7 @@ doesn't take the BKL. | |||
461 | ->read on directories probably must go away - we should just enforce -EISDIR | 461 | ->read on directories probably must go away - we should just enforce -EISDIR |
462 | in sys_read() and friends. | 462 | in sys_read() and friends. |
463 | 463 | ||
464 | ->fsync() has i_sem on inode. | 464 | ->fsync() has i_mutex on inode. |
465 | 465 | ||
466 | --------------------------- dquot_operations ------------------------------- | 466 | --------------------------- dquot_operations ------------------------------- |
467 | prototypes: | 467 | prototypes: |
diff --git a/Documentation/filesystems/hpfs.txt b/Documentation/filesystems/hpfs.txt index 38aba03efc5e..fa45c3baed98 100644 --- a/Documentation/filesystems/hpfs.txt +++ b/Documentation/filesystems/hpfs.txt | |||
@@ -290,7 +290,7 @@ History | |||
290 | 2.07 More fixes for Warp Server. Now it really works | 290 | 2.07 More fixes for Warp Server. Now it really works |
291 | 2.08 Creating new files is not so slow on large disks | 291 | 2.08 Creating new files is not so slow on large disks |
292 | An attempt to sync deleted file does not generate filesystem error | 292 | An attempt to sync deleted file does not generate filesystem error |
293 | 2.09 Fixed error on extremly fragmented files | 293 | 2.09 Fixed error on extremely fragmented files |
294 | 294 | ||
295 | 295 | ||
296 | vim: set textwidth=80: | 296 | vim: set textwidth=80: |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index 81779068b09b..8ee10ec88293 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
@@ -349,7 +349,7 @@ end of the line. | |||
349 | Note the "Should sync?" parameter "nosync" means that the two mirrors are | 349 | Note the "Should sync?" parameter "nosync" means that the two mirrors are |
350 | already in sync which will be the case on a clean shutdown of Windows. If the | 350 | already in sync which will be the case on a clean shutdown of Windows. If the |
351 | mirrors are not clean, you can specify the "sync" option instead of "nosync" | 351 | mirrors are not clean, you can specify the "sync" option instead of "nosync" |
352 | and the Device-Mapper driver will then copy the entirey of the "Source Device" | 352 | and the Device-Mapper driver will then copy the entirety of the "Source Device" |
353 | to the "Target Device" or if you specified multipled target devices to all of | 353 | to the "Target Device" or if you specified multipled target devices to all of |
354 | them. | 354 | them. |
355 | 355 | ||
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 4f3e84c520a5..8756a07f4dc3 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -229,7 +229,7 @@ Table 1-3: Kernel info in /proc | |||
229 | mounts Mounted filesystems | 229 | mounts Mounted filesystems |
230 | net Networking info (see text) | 230 | net Networking info (see text) |
231 | partitions Table of partitions known to the system | 231 | partitions Table of partitions known to the system |
232 | pci Depreciated info of PCI bus (new way -> /proc/bus/pci/, | 232 | pci Deprecated info of PCI bus (new way -> /proc/bus/pci/, |
233 | decoupled by lspci (2.4) | 233 | decoupled by lspci (2.4) |
234 | rtc Real time clock | 234 | rtc Real time clock |
235 | scsi SCSI info (see text) | 235 | scsi SCSI info (see text) |
diff --git a/Documentation/filesystems/relay.txt b/Documentation/filesystems/relay.txt index 7fbb6ffe5769..18d23f9a18c7 100644 --- a/Documentation/filesystems/relay.txt +++ b/Documentation/filesystems/relay.txt | |||
@@ -351,7 +351,7 @@ If the current buffer is full, i.e. all sub-buffers remain unconsumed, | |||
351 | the callback returns 0 to indicate that the buffer switch should not | 351 | the callback returns 0 to indicate that the buffer switch should not |
352 | occur yet, i.e. until the consumer has had a chance to read the | 352 | occur yet, i.e. until the consumer has had a chance to read the |
353 | current set of ready sub-buffers. For the relay_buf_full() function | 353 | current set of ready sub-buffers. For the relay_buf_full() function |
354 | to make sense, the consumer is reponsible for notifying the relay | 354 | to make sense, the consumer is responsible for notifying the relay |
355 | interface when sub-buffers have been consumed via | 355 | interface when sub-buffers have been consumed via |
356 | relay_subbufs_consumed(). Any subsequent attempts to write into the | 356 | relay_subbufs_consumed(). Any subsequent attempts to write into the |
357 | buffer will again invoke the subbuf_start() callback with the same | 357 | buffer will again invoke the subbuf_start() callback with the same |
diff --git a/Documentation/filesystems/xip.txt b/Documentation/filesystems/xip.txt index 6c0cef10eb4d..3cc4010521a0 100644 --- a/Documentation/filesystems/xip.txt +++ b/Documentation/filesystems/xip.txt | |||
@@ -19,7 +19,7 @@ completely. With execute-in-place, read&write type operations are performed | |||
19 | directly from/to the memory backed storage device. For file mappings, the | 19 | directly from/to the memory backed storage device. For file mappings, the |
20 | storage device itself is mapped directly into userspace. | 20 | storage device itself is mapped directly into userspace. |
21 | 21 | ||
22 | This implementation was initialy written for shared memory segments between | 22 | This implementation was initially written for shared memory segments between |
23 | different virtual machines on s390 hardware to allow multiple machines to | 23 | different virtual machines on s390 hardware to allow multiple machines to |
24 | share the same binaries and libraries. | 24 | share the same binaries and libraries. |
25 | 25 | ||