diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 00:12:50 -0400 |
commit | 69a7aebcf019ab3ff5764525ad6858fbe23bb86d (patch) | |
tree | 7211df5704b743a7667159748c670a9744164482 /Documentation/filesystems | |
parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
parent | f1f996b66cc3908a8f5ffccc2ff41840e92f3b10 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
Diffstat (limited to 'Documentation/filesystems')
-rw-r--r-- | Documentation/filesystems/ext4.txt | 4 | ||||
-rw-r--r-- | Documentation/filesystems/gfs2-uevents.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/pohmelfs/network_protocol.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/ramfs-rootfs-initramfs.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/vfs.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt index 10ec4639f152..8c10bf375c73 100644 --- a/Documentation/filesystems/ext4.txt +++ b/Documentation/filesystems/ext4.txt | |||
@@ -308,7 +308,7 @@ min_batch_time=usec This parameter sets the commit time (as | |||
308 | fast disks, at the cost of increasing latency. | 308 | fast disks, at the cost of increasing latency. |
309 | 309 | ||
310 | journal_ioprio=prio The I/O priority (from 0 to 7, where 0 is the | 310 | journal_ioprio=prio The I/O priority (from 0 to 7, where 0 is the |
311 | highest priorty) which should be used for I/O | 311 | highest priority) which should be used for I/O |
312 | operations submitted by kjournald2 during a | 312 | operations submitted by kjournald2 during a |
313 | commit operation. This defaults to 3, which is | 313 | commit operation. This defaults to 3, which is |
314 | a slightly higher priority than the default I/O | 314 | a slightly higher priority than the default I/O |
@@ -343,7 +343,7 @@ noinit_itable Do not initialize any uninitialized inode table | |||
343 | init_itable=n The lazy itable init code will wait n times the | 343 | init_itable=n The lazy itable init code will wait n times the |
344 | number of milliseconds it took to zero out the | 344 | number of milliseconds it took to zero out the |
345 | previous block group's inode table. This | 345 | previous block group's inode table. This |
346 | minimizes the impact on the systme performance | 346 | minimizes the impact on the system performance |
347 | while file system's inode table is being initialized. | 347 | while file system's inode table is being initialized. |
348 | 348 | ||
349 | discard Controls whether ext4 should issue discard/TRIM | 349 | discard Controls whether ext4 should issue discard/TRIM |
diff --git a/Documentation/filesystems/gfs2-uevents.txt b/Documentation/filesystems/gfs2-uevents.txt index d81889669293..19a19ebebc34 100644 --- a/Documentation/filesystems/gfs2-uevents.txt +++ b/Documentation/filesystems/gfs2-uevents.txt | |||
@@ -62,7 +62,7 @@ be fixed. | |||
62 | 62 | ||
63 | The REMOVE uevent is generated at the end of an unsuccessful mount | 63 | The REMOVE uevent is generated at the end of an unsuccessful mount |
64 | or at the end of a umount of the filesystem. All REMOVE uevents will | 64 | or at the end of a umount of the filesystem. All REMOVE uevents will |
65 | have been preceded by at least an ADD uevent for the same fileystem, | 65 | have been preceded by at least an ADD uevent for the same filesystem, |
66 | and unlike the other uevents is generated automatically by the kernel's | 66 | and unlike the other uevents is generated automatically by the kernel's |
67 | kobject subsystem. | 67 | kobject subsystem. |
68 | 68 | ||
diff --git a/Documentation/filesystems/pohmelfs/network_protocol.txt b/Documentation/filesystems/pohmelfs/network_protocol.txt index 65e03dd44823..c680b4b5353d 100644 --- a/Documentation/filesystems/pohmelfs/network_protocol.txt +++ b/Documentation/filesystems/pohmelfs/network_protocol.txt | |||
@@ -20,7 +20,7 @@ Commands can be embedded into transaction command (which in turn has own command | |||
20 | so one can extend protocol as needed without breaking backward compatibility as long | 20 | so one can extend protocol as needed without breaking backward compatibility as long |
21 | as old commands are supported. All string lengths include tail 0 byte. | 21 | as old commands are supported. All string lengths include tail 0 byte. |
22 | 22 | ||
23 | All commands are transferred over the network in big-endian. CPU endianess is used at the end peers. | 23 | All commands are transferred over the network in big-endian. CPU endianness is used at the end peers. |
24 | 24 | ||
25 | @cmd - command number, which specifies command to be processed. Following | 25 | @cmd - command number, which specifies command to be processed. Following |
26 | commands are used currently: | 26 | commands are used currently: |
diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt index a8273d5fad20..59b4a0962e0f 100644 --- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt +++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt | |||
@@ -297,7 +297,7 @@ the above threads) is: | |||
297 | either way about the archive format, and there are alternative tools, | 297 | either way about the archive format, and there are alternative tools, |
298 | such as: | 298 | such as: |
299 | 299 | ||
300 | http://freshmeat.net/projects/afio/ | 300 | http://freecode.com/projects/afio |
301 | 301 | ||
302 | 2) The cpio archive format chosen by the kernel is simpler and cleaner (and | 302 | 2) The cpio archive format chosen by the kernel is simpler and cleaner (and |
303 | thus easier to create and parse) than any of the (literally dozens of) | 303 | thus easier to create and parse) than any of the (literally dozens of) |
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 3d9393b845b8..e916e3d36488 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt | |||
@@ -993,7 +993,7 @@ struct dentry_operations { | |||
993 | 993 | ||
994 | If the 'rcu_walk' parameter is true, then the caller is doing a | 994 | If the 'rcu_walk' parameter is true, then the caller is doing a |
995 | pathwalk in RCU-walk mode. Sleeping is not permitted in this mode, | 995 | pathwalk in RCU-walk mode. Sleeping is not permitted in this mode, |
996 | and the caller can be asked to leave it and call again by returing | 996 | and the caller can be asked to leave it and call again by returning |
997 | -ECHILD. | 997 | -ECHILD. |
998 | 998 | ||
999 | This function is only used if DCACHE_MANAGE_TRANSIT is set on the | 999 | This function is only used if DCACHE_MANAGE_TRANSIT is set on the |