aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 12:36:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-06 12:36:28 -0400
commit2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch)
tree8ce40f811092844ea9da683804db6e2afa410808 /Documentation/filesystems
parent22e04f6b4b04a8afe9af9239224591d06ba3b24d (diff)
parentf8ea61e63442c25cbe6ddee48979b444f1f2a01c (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "The usual trivial updates all over the tree -- mostly typo fixes and documentation updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits) doc: Documentation/cputopology.txt fix typo treewide: Convert retrun typos to return Fix comment typo for init_cma_reserved_pageblock Documentation/trace: Correcting and extending tracepoint documentation mm/hotplug: fix a typo in Documentation/memory-hotplug.txt power: Documentation: Update s2ram link doc: fix a typo in Documentation/00-INDEX Documentation/printk-formats.txt: No casts needed for u64/s64 doc: Fix typo "is is" in Documentations treewide: Fix printks with 0x%# zram: doc fixes Documentation/kmemcheck: update kmemcheck documentation doc: documentation/hwspinlock.txt fix typo PM / Hibernate: add section for resume options doc: filesystems : Fix typo in Documentations/filesystems scsi/megaraid fixed several typos in comments ppc: init_32: Fix error typo "CONFIG_START_KERNEL" treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks page_isolation: Fix a comment typo in test_pages_isolated() doc: fix a typo about irq affinity ...
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r--Documentation/filesystems/btrfs.txt2
-rw-r--r--Documentation/filesystems/ext4.txt2
-rw-r--r--Documentation/filesystems/nfs/Exporting2
-rw-r--r--Documentation/filesystems/nfs/pnfs.txt2
-rw-r--r--Documentation/filesystems/qnx6.txt2
-rw-r--r--Documentation/filesystems/relay.txt2
-rw-r--r--Documentation/filesystems/sysfs-tagging.txt2
-rw-r--r--Documentation/filesystems/xfs.txt2
8 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index b349d57b76ea..9dae59407437 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -87,7 +87,7 @@ Unless otherwise specified, all options default to off.
87 87
88 device=<devicepath> 88 device=<devicepath>
89 Specify a device during mount so that ioctls on the control device 89 Specify a device during mount so that ioctls on the control device
90 can be avoided. Especialy useful when trying to mount a multi-device 90 can be avoided. Especially useful when trying to mount a multi-device
91 setup as root. May be specified multiple times for multiple devices. 91 setup as root. May be specified multiple times for multiple devices.
92 92
93 discard 93 discard
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index b91cfaaf6a0f..919a3293aaa4 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -2,7 +2,7 @@
2Ext4 Filesystem 2Ext4 Filesystem
3=============== 3===============
4 4
5Ext4 is an an advanced level of the ext3 filesystem which incorporates 5Ext4 is an advanced level of the ext3 filesystem which incorporates
6scalability and reliability enhancements for supporting large filesystems 6scalability and reliability enhancements for supporting large filesystems
7(64 bit) in keeping with increasing disk capacities and state-of-the-art 7(64 bit) in keeping with increasing disk capacities and state-of-the-art
8feature requirements. 8feature requirements.
diff --git a/Documentation/filesystems/nfs/Exporting b/Documentation/filesystems/nfs/Exporting
index 09994c247289..e543b1a619cc 100644
--- a/Documentation/filesystems/nfs/Exporting
+++ b/Documentation/filesystems/nfs/Exporting
@@ -93,7 +93,7 @@ For a filesystem to be exportable it must:
93 2/ make sure that d_splice_alias is used rather than d_add 93 2/ make sure that d_splice_alias is used rather than d_add
94 when ->lookup finds an inode for a given parent and name. 94 when ->lookup finds an inode for a given parent and name.
95 95
96 If inode is NULL, d_splice_alias(inode, dentry) is eqivalent to 96 If inode is NULL, d_splice_alias(inode, dentry) is equivalent to
97 97
98 d_add(dentry, inode), NULL 98 d_add(dentry, inode), NULL
99 99
diff --git a/Documentation/filesystems/nfs/pnfs.txt b/Documentation/filesystems/nfs/pnfs.txt
index 52ae07f5f578..adc81a35fe2d 100644
--- a/Documentation/filesystems/nfs/pnfs.txt
+++ b/Documentation/filesystems/nfs/pnfs.txt
@@ -12,7 +12,7 @@ struct pnfs_layout_hdr
12---------------------- 12----------------------
13The on-the-wire command LAYOUTGET corresponds to struct 13The on-the-wire command LAYOUTGET corresponds to struct
14pnfs_layout_segment, usually referred to by the variable name lseg. 14pnfs_layout_segment, usually referred to by the variable name lseg.
15Each nfs_inode may hold a pointer to a cache of of these layout 15Each nfs_inode may hold a pointer to a cache of these layout
16segments in nfsi->layout, of type struct pnfs_layout_hdr. 16segments in nfsi->layout, of type struct pnfs_layout_hdr.
17 17
18We reference the header for the inode pointing to it, across each 18We reference the header for the inode pointing to it, across each
diff --git a/Documentation/filesystems/qnx6.txt b/Documentation/filesystems/qnx6.txt
index 99e90184a72f..408679789136 100644
--- a/Documentation/filesystems/qnx6.txt
+++ b/Documentation/filesystems/qnx6.txt
@@ -149,7 +149,7 @@ Bitmap system area
149------------------ 149------------------
150 150
151The bitmap itself is divided into three parts. 151The bitmap itself is divided into three parts.
152First the system area, that is split into two halfs. 152First the system area, that is split into two halves.
153Then userspace. 153Then userspace.
154 154
155The requirement for a static, fixed preallocated system area comes from how 155The requirement for a static, fixed preallocated system area comes from how
diff --git a/Documentation/filesystems/relay.txt b/Documentation/filesystems/relay.txt
index 510b722667ac..33e2f3694733 100644
--- a/Documentation/filesystems/relay.txt
+++ b/Documentation/filesystems/relay.txt
@@ -31,7 +31,7 @@ Semantics
31 31
32Each relay channel has one buffer per CPU, each buffer has one or more 32Each relay channel has one buffer per CPU, each buffer has one or more
33sub-buffers. Messages are written to the first sub-buffer until it is 33sub-buffers. Messages are written to the first sub-buffer until it is
34too full to contain a new message, in which case it it is written to 34too full to contain a new message, in which case it is written to
35the next (if available). Messages are never split across sub-buffers. 35the next (if available). Messages are never split across sub-buffers.
36At this point, userspace can be notified so it empties the first 36At this point, userspace can be notified so it empties the first
37sub-buffer, while the kernel continues writing to the next. 37sub-buffer, while the kernel continues writing to the next.
diff --git a/Documentation/filesystems/sysfs-tagging.txt b/Documentation/filesystems/sysfs-tagging.txt
index caaaf1266d8f..eb843e49c5a3 100644
--- a/Documentation/filesystems/sysfs-tagging.txt
+++ b/Documentation/filesystems/sysfs-tagging.txt
@@ -24,7 +24,7 @@ flag between KOBJ_NS_TYPE_NONE and KOBJ_NS_TYPES, and s_ns will
24point to the namespace to which it belongs. 24point to the namespace to which it belongs.
25 25
26Each sysfs superblock's sysfs_super_info contains an array void 26Each sysfs superblock's sysfs_super_info contains an array void
27*ns[KOBJ_NS_TYPES]. When a a task in a tagging namespace 27*ns[KOBJ_NS_TYPES]. When a task in a tagging namespace
28kobj_nstype first mounts sysfs, a new superblock is created. It 28kobj_nstype first mounts sysfs, a new superblock is created. It
29will be differentiated from other sysfs mounts by having its 29will be differentiated from other sysfs mounts by having its
30s_fs_info->ns[kobj_nstype] set to the new namespace. Note that 30s_fs_info->ns[kobj_nstype] set to the new namespace. Note that
diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 12525b17d9ed..5be51fd888bd 100644
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -135,7 +135,7 @@ default behaviour.
135 If the memory cost of 8 log buffers is too high on small 135 If the memory cost of 8 log buffers is too high on small
136 systems, then it may be reduced at some cost to performance 136 systems, then it may be reduced at some cost to performance
137 on metadata intensive workloads. The logbsize option below 137 on metadata intensive workloads. The logbsize option below
138 controls the size of each buffer and so is also relevent to 138 controls the size of each buffer and so is also relevant to
139 this case. 139 this case.
140 140
141 logbsize=value 141 logbsize=value