Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
此提交包含在:
@@ -6522,7 +6522,7 @@ reada:
|
||||
}
|
||||
|
||||
/*
|
||||
* hepler to process tree block while walking down the tree.
|
||||
* helper to process tree block while walking down the tree.
|
||||
*
|
||||
* when wc->stage == UPDATE_BACKREF, this function updates
|
||||
* back refs for pointers in the block.
|
||||
@@ -6597,7 +6597,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
|
||||
}
|
||||
|
||||
/*
|
||||
* hepler to process tree block pointer.
|
||||
* helper to process tree block pointer.
|
||||
*
|
||||
* when wc->stage == DROP_REFERENCE, this function checks
|
||||
* reference count of the block pointed to. if the block
|
||||
@@ -6735,7 +6735,7 @@ skip:
|
||||
}
|
||||
|
||||
/*
|
||||
* hepler to process tree block while walking up the tree.
|
||||
* helper to process tree block while walking up the tree.
|
||||
*
|
||||
* when wc->stage == DROP_REFERENCE, this function drops
|
||||
* reference count on the block.
|
||||
|
@@ -3472,7 +3472,7 @@ out:
|
||||
}
|
||||
|
||||
/*
|
||||
* hepler to find all tree blocks that reference a given data extent
|
||||
* helper to find all tree blocks that reference a given data extent
|
||||
*/
|
||||
static noinline_for_stack
|
||||
int add_data_references(struct reloc_control *rc,
|
||||
@@ -3566,7 +3566,7 @@ int add_data_references(struct reloc_control *rc,
|
||||
}
|
||||
|
||||
/*
|
||||
* hepler to find next unprocessed extent
|
||||
* helper to find next unprocessed extent
|
||||
*/
|
||||
static noinline_for_stack
|
||||
int find_next_extent(struct btrfs_trans_handle *trans,
|
||||
|
@@ -112,7 +112,6 @@ loop:
|
||||
* to redo the trans_no_join checks above
|
||||
*/
|
||||
kmem_cache_free(btrfs_transaction_cachep, cur_trans);
|
||||
cur_trans = fs_info->running_transaction;
|
||||
goto loop;
|
||||
} else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
|
||||
spin_unlock(&fs_info->trans_lock);
|
||||
|
@@ -76,7 +76,7 @@ symlink_hash(unsigned int link_len, const char *link_str, u8 *md5_hash)
|
||||
}
|
||||
rc = crypto_shash_update(&sdescmd5->shash, link_str, link_len);
|
||||
if (rc) {
|
||||
cERROR(1, "%s: Could not update iwth link_str", __func__);
|
||||
cERROR(1, "%s: Could not update with link_str", __func__);
|
||||
goto symlink_hash_err;
|
||||
}
|
||||
rc = crypto_shash_final(&sdescmd5->shash, md5_hash);
|
||||
|
@@ -147,7 +147,7 @@ static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode)
|
||||
/*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) {
|
||||
Some unknown structures like ACL may be in fnode,
|
||||
we'd better not overwrite them
|
||||
hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 stuctures", i->i_ino);
|
||||
hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 structures", i->i_ino);
|
||||
} else*/ if (hpfs_sb(i->i_sb)->sb_eas >= 2) {
|
||||
__le32 ea;
|
||||
if (!uid_eq(i->i_uid, hpfs_sb(i->i_sb)->sb_uid) || hpfs_inode->i_ea_uid) {
|
||||
|
@@ -154,7 +154,7 @@ static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
|
||||
/*
|
||||
* If we really return the number of allocated & free inodes, some
|
||||
* applications will fail because they won't see enough free inodes.
|
||||
* We'll try to calculate some guess as to how may inodes we can
|
||||
* We'll try to calculate some guess as to how many inodes we can
|
||||
* really allocate
|
||||
*
|
||||
* buf->f_files = atomic_read(&imap->im_numinos);
|
||||
|
@@ -870,7 +870,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,
|
||||
/* we've had some trouble with handlers seemingly vanishing. */
|
||||
mlog_bug_on_msg(o2net_handler_tree_lookup(msg_type, key, &p,
|
||||
&parent) == NULL,
|
||||
"couldn't find handler we *just* registerd "
|
||||
"couldn't find handler we *just* registered "
|
||||
"for type %u key %08x\n", msg_type, key);
|
||||
}
|
||||
write_unlock(&o2net_handler_lock);
|
||||
|
@@ -285,7 +285,7 @@ static struct buffer_head *qnx6_check_first_superblock(struct super_block *s,
|
||||
if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) {
|
||||
/* we got a big endian fs */
|
||||
QNX6DEBUG((KERN_INFO "qnx6: fs got different"
|
||||
" endianess.\n"));
|
||||
" endianness.\n"));
|
||||
return bh;
|
||||
} else
|
||||
sbi->s_bytesex = BYTESEX_LE;
|
||||
|
新增問題並參考
封鎖使用者