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 ...
This commit is contained in:
@@ -89,7 +89,6 @@
|
||||
#include "disk-io.h"
|
||||
#include "transaction.h"
|
||||
#include "extent_io.h"
|
||||
#include "disk-io.h"
|
||||
#include "volumes.h"
|
||||
#include "print-tree.h"
|
||||
#include "locking.h"
|
||||
|
||||
@@ -1068,7 +1068,7 @@ int btrfs_write_out_cache(struct btrfs_root *root,
|
||||
spin_unlock(&block_group->lock);
|
||||
ret = 0;
|
||||
#ifdef DEBUG
|
||||
printk(KERN_ERR "btrfs: failed to write free space cace "
|
||||
printk(KERN_ERR "btrfs: failed to write free space cache "
|
||||
"for block group %llu\n", block_group->key.objectid);
|
||||
#endif
|
||||
}
|
||||
|
||||
+3
-3
@@ -257,10 +257,10 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
|
||||
|
||||
/* Do sanity checks on the superblock */
|
||||
if (super.magic != CRAMFS_MAGIC) {
|
||||
/* check for wrong endianess */
|
||||
/* check for wrong endianness */
|
||||
if (super.magic == CRAMFS_MAGIC_WEND) {
|
||||
if (!silent)
|
||||
printk(KERN_ERR "cramfs: wrong endianess\n");
|
||||
printk(KERN_ERR "cramfs: wrong endianness\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -270,7 +270,7 @@ static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
|
||||
mutex_unlock(&read_mutex);
|
||||
if (super.magic != CRAMFS_MAGIC) {
|
||||
if (super.magic == CRAMFS_MAGIC_WEND && !silent)
|
||||
printk(KERN_ERR "cramfs: wrong endianess\n");
|
||||
printk(KERN_ERR "cramfs: wrong endianness\n");
|
||||
else if (!silent)
|
||||
printk(KERN_ERR "cramfs: wrong magic\n");
|
||||
goto out;
|
||||
|
||||
+1
-1
@@ -1284,7 +1284,7 @@ int writeback_inodes_sb_if_idle(struct super_block *sb, enum wb_reason reason)
|
||||
EXPORT_SYMBOL(writeback_inodes_sb_if_idle);
|
||||
|
||||
/**
|
||||
* writeback_inodes_sb_if_idle - start writeback if none underway
|
||||
* writeback_inodes_sb_nr_if_idle - start writeback if none underway
|
||||
* @sb: the superblock
|
||||
* @nr: the number of pages to write
|
||||
* @reason: reason why some writeback work was initiated
|
||||
|
||||
+1
-1
@@ -340,7 +340,7 @@ int jffs2_unregister_compressor(struct jffs2_compressor *comp)
|
||||
|
||||
if (comp->usecount) {
|
||||
spin_unlock(&jffs2_compressor_list_lock);
|
||||
printk(KERN_WARNING "JFFS2: Compressor modul is in use. Unregister failed.\n");
|
||||
printk(KERN_WARNING "JFFS2: Compressor module is in use. Unregister failed.\n");
|
||||
return -1;
|
||||
}
|
||||
list_del(&comp->list);
|
||||
|
||||
+2
-2
@@ -2008,14 +2008,14 @@ typedef struct {
|
||||
*
|
||||
* When a directory is small enough to fit inside the index root then this
|
||||
* is the only attribute describing the directory. When the directory is too
|
||||
* large to fit in the index root, on the other hand, two aditional attributes
|
||||
* large to fit in the index root, on the other hand, two additional attributes
|
||||
* are present: an index allocation attribute, containing sub-nodes of the B+
|
||||
* directory tree (see below), and a bitmap attribute, describing which virtual
|
||||
* cluster numbers (vcns) in the index allocation attribute are in use by an
|
||||
* index block.
|
||||
*
|
||||
* NOTE: The root directory (FILE_root) contains an entry for itself. Other
|
||||
* dircetories do not contain entries for themselves, though.
|
||||
* directories do not contain entries for themselves, though.
|
||||
*/
|
||||
typedef struct {
|
||||
ATTR_TYPE type; /* Type of the indexed attribute. Is
|
||||
|
||||
+1
-1
@@ -513,7 +513,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
|
||||
|
||||
n = copy_to_user(buffer, (char *)start, tsz);
|
||||
/*
|
||||
* We cannot distingush between fault on source
|
||||
* We cannot distinguish between fault on source
|
||||
* and fault on destination. When this happens
|
||||
* we clear too and hope it will trigger the
|
||||
* EFAULT again.
|
||||
|
||||
@@ -975,7 +975,7 @@ static int leaf_cut_entries(struct buffer_head *bh,
|
||||
remove */
|
||||
RFALSE(!is_direntry_le_ih(ih), "10180: item is not directory item");
|
||||
RFALSE(I_ENTRY_COUNT(ih) < from + del_count,
|
||||
"10185: item contains not enough entries: entry_cout = %d, from = %d, to delete = %d",
|
||||
"10185: item contains not enough entries: entry_count = %d, from = %d, to delete = %d",
|
||||
I_ENTRY_COUNT(ih), from, del_count);
|
||||
|
||||
if (del_count == 0)
|
||||
|
||||
Reference in New Issue
Block a user