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 /fs | |
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 'fs')
-rw-r--r-- | fs/btrfs/check-integrity.c | 1 | ||||
-rw-r--r-- | fs/btrfs/free-space-cache.c | 2 | ||||
-rw-r--r-- | fs/cramfs/inode.c | 6 | ||||
-rw-r--r-- | fs/fs-writeback.c | 2 | ||||
-rw-r--r-- | fs/jffs2/compr.c | 2 | ||||
-rw-r--r-- | fs/ntfs/layout.h | 4 | ||||
-rw-r--r-- | fs/proc/kcore.c | 2 | ||||
-rw-r--r-- | fs/reiserfs/lbalance.c | 2 |
8 files changed, 10 insertions, 11 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index d986824bb2b..c053e90f200 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c | |||
@@ -89,7 +89,6 @@ | |||
89 | #include "disk-io.h" | 89 | #include "disk-io.h" |
90 | #include "transaction.h" | 90 | #include "transaction.h" |
91 | #include "extent_io.h" | 91 | #include "extent_io.h" |
92 | #include "disk-io.h" | ||
93 | #include "volumes.h" | 92 | #include "volumes.h" |
94 | #include "print-tree.h" | 93 | #include "print-tree.h" |
95 | #include "locking.h" | 94 | #include "locking.h" |
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 710ea380c7e..b02e379b14c 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c | |||
@@ -1068,7 +1068,7 @@ int btrfs_write_out_cache(struct btrfs_root *root, | |||
1068 | spin_unlock(&block_group->lock); | 1068 | spin_unlock(&block_group->lock); |
1069 | ret = 0; | 1069 | ret = 0; |
1070 | #ifdef DEBUG | 1070 | #ifdef DEBUG |
1071 | printk(KERN_ERR "btrfs: failed to write free space cace " | 1071 | printk(KERN_ERR "btrfs: failed to write free space cache " |
1072 | "for block group %llu\n", block_group->key.objectid); | 1072 | "for block group %llu\n", block_group->key.objectid); |
1073 | #endif | 1073 | #endif |
1074 | } | 1074 | } |
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index a2ee8f9f5a3..04d51f9333d 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c | |||
@@ -257,10 +257,10 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent) | |||
257 | 257 | ||
258 | /* Do sanity checks on the superblock */ | 258 | /* Do sanity checks on the superblock */ |
259 | if (super.magic != CRAMFS_MAGIC) { | 259 | if (super.magic != CRAMFS_MAGIC) { |
260 | /* check for wrong endianess */ | 260 | /* check for wrong endianness */ |
261 | if (super.magic == CRAMFS_MAGIC_WEND) { | 261 | if (super.magic == CRAMFS_MAGIC_WEND) { |
262 | if (!silent) | 262 | if (!silent) |
263 | printk(KERN_ERR "cramfs: wrong endianess\n"); | 263 | printk(KERN_ERR "cramfs: wrong endianness\n"); |
264 | goto out; | 264 | goto out; |
265 | } | 265 | } |
266 | 266 | ||
@@ -270,7 +270,7 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent) | |||
270 | mutex_unlock(&read_mutex); | 270 | mutex_unlock(&read_mutex); |
271 | if (super.magic != CRAMFS_MAGIC) { | 271 | if (super.magic != CRAMFS_MAGIC) { |
272 | if (super.magic == CRAMFS_MAGIC_WEND && !silent) | 272 | if (super.magic == CRAMFS_MAGIC_WEND && !silent) |
273 | printk(KERN_ERR "cramfs: wrong endianess\n"); | 273 | printk(KERN_ERR "cramfs: wrong endianness\n"); |
274 | else if (!silent) | 274 | else if (!silent) |
275 | printk(KERN_ERR "cramfs: wrong magic\n"); | 275 | printk(KERN_ERR "cramfs: wrong magic\n"); |
276 | goto out; | 276 | goto out; |
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 5b4a9362d5a..77b535ac713 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -1284,7 +1284,7 @@ int writeback_inodes_sb_if_idle(struct super_block *sb, enum wb_reason reason) | |||
1284 | EXPORT_SYMBOL(writeback_inodes_sb_if_idle); | 1284 | EXPORT_SYMBOL(writeback_inodes_sb_if_idle); |
1285 | 1285 | ||
1286 | /** | 1286 | /** |
1287 | * writeback_inodes_sb_if_idle - start writeback if none underway | 1287 | * writeback_inodes_sb_nr_if_idle - start writeback if none underway |
1288 | * @sb: the superblock | 1288 | * @sb: the superblock |
1289 | * @nr: the number of pages to write | 1289 | * @nr: the number of pages to write |
1290 | * @reason: reason why some writeback work was initiated | 1290 | * @reason: reason why some writeback work was initiated |
diff --git a/fs/jffs2/compr.c b/fs/jffs2/compr.c index 5b6c9d1a2fb..96ed3c9ec3f 100644 --- a/fs/jffs2/compr.c +++ b/fs/jffs2/compr.c | |||
@@ -340,7 +340,7 @@ int jffs2_unregister_compressor(struct jffs2_compressor *comp) | |||
340 | 340 | ||
341 | if (comp->usecount) { | 341 | if (comp->usecount) { |
342 | spin_unlock(&jffs2_compressor_list_lock); | 342 | spin_unlock(&jffs2_compressor_list_lock); |
343 | printk(KERN_WARNING "JFFS2: Compressor modul is in use. Unregister failed.\n"); | 343 | printk(KERN_WARNING "JFFS2: Compressor module is in use. Unregister failed.\n"); |
344 | return -1; | 344 | return -1; |
345 | } | 345 | } |
346 | list_del(&comp->list); | 346 | list_del(&comp->list); |
diff --git a/fs/ntfs/layout.h b/fs/ntfs/layout.h index faece719086..809c0e6d8e0 100644 --- a/fs/ntfs/layout.h +++ b/fs/ntfs/layout.h | |||
@@ -2008,14 +2008,14 @@ typedef struct { | |||
2008 | * | 2008 | * |
2009 | * When a directory is small enough to fit inside the index root then this | 2009 | * When a directory is small enough to fit inside the index root then this |
2010 | * is the only attribute describing the directory. When the directory is too | 2010 | * is the only attribute describing the directory. When the directory is too |
2011 | * large to fit in the index root, on the other hand, two aditional attributes | 2011 | * large to fit in the index root, on the other hand, two additional attributes |
2012 | * are present: an index allocation attribute, containing sub-nodes of the B+ | 2012 | * are present: an index allocation attribute, containing sub-nodes of the B+ |
2013 | * directory tree (see below), and a bitmap attribute, describing which virtual | 2013 | * directory tree (see below), and a bitmap attribute, describing which virtual |
2014 | * cluster numbers (vcns) in the index allocation attribute are in use by an | 2014 | * cluster numbers (vcns) in the index allocation attribute are in use by an |
2015 | * index block. | 2015 | * index block. |
2016 | * | 2016 | * |
2017 | * NOTE: The root directory (FILE_root) contains an entry for itself. Other | 2017 | * NOTE: The root directory (FILE_root) contains an entry for itself. Other |
2018 | * dircetories do not contain entries for themselves, though. | 2018 | * directories do not contain entries for themselves, though. |
2019 | */ | 2019 | */ |
2020 | typedef struct { | 2020 | typedef struct { |
2021 | ATTR_TYPE type; /* Type of the indexed attribute. Is | 2021 | ATTR_TYPE type; /* Type of the indexed attribute. Is |
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index d245cb23dd7..e5e69aff6c6 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
@@ -513,7 +513,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) | |||
513 | 513 | ||
514 | n = copy_to_user(buffer, (char *)start, tsz); | 514 | n = copy_to_user(buffer, (char *)start, tsz); |
515 | /* | 515 | /* |
516 | * We cannot distingush between fault on source | 516 | * We cannot distinguish between fault on source |
517 | * and fault on destination. When this happens | 517 | * and fault on destination. When this happens |
518 | * we clear too and hope it will trigger the | 518 | * we clear too and hope it will trigger the |
519 | * EFAULT again. | 519 | * EFAULT again. |
diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c index 03d85cbf90b..b43d0155631 100644 --- a/fs/reiserfs/lbalance.c +++ b/fs/reiserfs/lbalance.c | |||
@@ -975,7 +975,7 @@ static int leaf_cut_entries(struct buffer_head *bh, | |||
975 | remove */ | 975 | remove */ |
976 | RFALSE(!is_direntry_le_ih(ih), "10180: item is not directory item"); | 976 | RFALSE(!is_direntry_le_ih(ih), "10180: item is not directory item"); |
977 | RFALSE(I_ENTRY_COUNT(ih) < from + del_count, | 977 | RFALSE(I_ENTRY_COUNT(ih) < from + del_count, |
978 | "10185: item contains not enough entries: entry_cout = %d, from = %d, to delete = %d", | 978 | "10185: item contains not enough entries: entry_count = %d, from = %d, to delete = %d", |
979 | I_ENTRY_COUNT(ih), from, del_count); | 979 | I_ENTRY_COUNT(ih), from, del_count); |
980 | 980 | ||
981 | if (del_count == 0) | 981 | if (del_count == 0) |