diff options
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/directory-locking | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/files.txt | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/spufs.txt | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/tmpfs.txt | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/vfat.txt | 2 | ||||
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/filesystems/directory-locking b/Documentation/filesystems/directory-locking index 34380d4fbce3..d7099a9266fb 100644 --- a/Documentation/filesystems/directory-locking +++ b/Documentation/filesystems/directory-locking @@ -82,7 +82,7 @@ own descendent. Moreover, there is exactly one cross-directory rename Consider the object blocking the cross-directory rename. One of its descendents is locked by cross-directory rename (otherwise we -would again have an infinite set of of contended objects). But that +would again have an infinite set of contended objects). But that means that cross-directory rename is taking locks out of order. Due to (2) the order hadn't changed since we had acquired filesystem lock. But locking rules for cross-directory rename guarantee that we do not diff --git a/Documentation/filesystems/files.txt b/Documentation/filesystems/files.txt index 8c206f4e0250..133e213ebb72 100644 --- a/Documentation/filesystems/files.txt +++ b/Documentation/filesystems/files.txt @@ -55,7 +55,7 @@ the fdtable structure - 2. Reading of the fdtable as described above must be protected by rcu_read_lock()/rcu_read_unlock(). -3. For any update to the the fd table, files->file_lock must +3. For any update to the fd table, files->file_lock must be held. 4. To look up the file structure given an fd, a reader diff --git a/Documentation/filesystems/spufs.txt b/Documentation/filesystems/spufs.txt index 3889a8066247..982645a1981d 100644 --- a/Documentation/filesystems/spufs.txt +++ b/Documentation/filesystems/spufs.txt @@ -105,7 +105,7 @@ FILES /wbox - The CPU to SPU communation mailbox. It is write-only can can be written + The CPU to SPU communation mailbox. It is write-only and can be written in units of 32 bits. If the mailbox is full, write() will block and poll can be used to wait for it becoming empty again. The possible operations on an open wbox file are: write(2) If a count smaller than diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt index f9bcf9f4934a..6dd050878a20 100644 --- a/Documentation/filesystems/tmpfs.txt +++ b/Documentation/filesystems/tmpfs.txt @@ -63,7 +63,7 @@ size: The limit of allocated bytes for this tmpfs instance. The nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE. nr_inodes: The maximum number of inodes for this instance. The default is half of the number of your physical RAM pages, or (on a - a machine with highmem) the number of lowmem RAM pages, + machine with highmem) the number of lowmem RAM pages, whichever is the lower. These parameters accept a suffix k, m or g for kilo, mega and giga and diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt index 2001abbc60e6..069cb1094300 100644 --- a/Documentation/filesystems/vfat.txt +++ b/Documentation/filesystems/vfat.txt @@ -35,7 +35,7 @@ iocharset=name -- Character set to use for converting between the you should consider the following option instead. utf8=<bool> -- UTF-8 is the filesystem safe version of Unicode that - is used by the console. It can be be enabled for the + is used by the console. It can be enabled for the filesystem with this option. If 'uni_xlate' gets set, UTF-8 gets disabled. diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index cd07c21b8400..7737bfd03cf8 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -410,7 +410,7 @@ otherwise noted. put_link: called by the VFS to release resources allocated by follow_link(). The cookie returned by follow_link() is passed - to to this method as the last parameter. It is used by + to this method as the last parameter. It is used by filesystems such as NFS where page cache is not stable (i.e. page that was installed when the symbolic link walk started might not be in the page cache at the end of the |