aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c /fs
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff)
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 ...
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c6
-rw-r--r--fs/btrfs/relocation.c4
-rw-r--r--fs/btrfs/transaction.c1
-rw-r--r--fs/cifs/link.c2
-rw-r--r--fs/hpfs/inode.c2
-rw-r--r--fs/jfs/super.c2
-rw-r--r--fs/ocfs2/cluster/tcp.c2
-rw-r--r--fs/qnx6/inode.c2
8 files changed, 10 insertions, 11 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 5a3327b8f90d..1e59ed575cc9 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6522,7 +6522,7 @@ reada:
6522} 6522}
6523 6523
6524/* 6524/*
6525 * hepler to process tree block while walking down the tree. 6525 * helper to process tree block while walking down the tree.
6526 * 6526 *
6527 * when wc->stage == UPDATE_BACKREF, this function updates 6527 * when wc->stage == UPDATE_BACKREF, this function updates
6528 * back refs for pointers in the block. 6528 * back refs for pointers in the block.
@@ -6597,7 +6597,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
6597} 6597}
6598 6598
6599/* 6599/*
6600 * hepler to process tree block pointer. 6600 * helper to process tree block pointer.
6601 * 6601 *
6602 * when wc->stage == DROP_REFERENCE, this function checks 6602 * when wc->stage == DROP_REFERENCE, this function checks
6603 * reference count of the block pointed to. if the block 6603 * reference count of the block pointed to. if the block
@@ -6735,7 +6735,7 @@ skip:
6735} 6735}
6736 6736
6737/* 6737/*
6738 * hepler to process tree block while walking up the tree. 6738 * helper to process tree block while walking up the tree.
6739 * 6739 *
6740 * when wc->stage == DROP_REFERENCE, this function drops 6740 * when wc->stage == DROP_REFERENCE, this function drops
6741 * reference count on the block. 6741 * reference count on the block.
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 300e09ac3659..17c306bf177a 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3472,7 +3472,7 @@ out:
3472} 3472}
3473 3473
3474/* 3474/*
3475 * hepler to find all tree blocks that reference a given data extent 3475 * helper to find all tree blocks that reference a given data extent
3476 */ 3476 */
3477static noinline_for_stack 3477static noinline_for_stack
3478int add_data_references(struct reloc_control *rc, 3478int add_data_references(struct reloc_control *rc,
@@ -3566,7 +3566,7 @@ int add_data_references(struct reloc_control *rc,
3566} 3566}
3567 3567
3568/* 3568/*
3569 * hepler to find next unprocessed extent 3569 * helper to find next unprocessed extent
3570 */ 3570 */
3571static noinline_for_stack 3571static noinline_for_stack
3572int find_next_extent(struct btrfs_trans_handle *trans, 3572int find_next_extent(struct btrfs_trans_handle *trans,
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index fc03aa60b684..4c0067c4f76d 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -112,7 +112,6 @@ loop:
112 * to redo the trans_no_join checks above 112 * to redo the trans_no_join checks above
113 */ 113 */
114 kmem_cache_free(btrfs_transaction_cachep, cur_trans); 114 kmem_cache_free(btrfs_transaction_cachep, cur_trans);
115 cur_trans = fs_info->running_transaction;
116 goto loop; 115 goto loop;
117 } else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) { 116 } else if (fs_info->fs_state & BTRFS_SUPER_FLAG_ERROR) {
118 spin_unlock(&fs_info->trans_lock); 117 spin_unlock(&fs_info->trans_lock);
diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index 51dc2fb6e854..9f6c4c45d21e 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -76,7 +76,7 @@ symlink_hash(unsigned int link_len, const char *link_str, u8 *md5_hash)
76 } 76 }
77 rc = crypto_shash_update(&sdescmd5->shash, link_str, link_len); 77 rc = crypto_shash_update(&sdescmd5->shash, link_str, link_len);
78 if (rc) { 78 if (rc) {
79 cERROR(1, "%s: Could not update iwth link_str", __func__); 79 cERROR(1, "%s: Could not update with link_str", __func__);
80 goto symlink_hash_err; 80 goto symlink_hash_err;
81 } 81 }
82 rc = crypto_shash_final(&sdescmd5->shash, md5_hash); 82 rc = crypto_shash_final(&sdescmd5->shash, md5_hash);
diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c
index 5dc06c837105..9edeeb0ea97e 100644
--- a/fs/hpfs/inode.c
+++ b/fs/hpfs/inode.c
@@ -147,7 +147,7 @@ static void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode)
147 /*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) { 147 /*if (le32_to_cpu(fnode->acl_size_l) || le16_to_cpu(fnode->acl_size_s)) {
148 Some unknown structures like ACL may be in fnode, 148 Some unknown structures like ACL may be in fnode,
149 we'd better not overwrite them 149 we'd better not overwrite them
150 hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 stuctures", i->i_ino); 150 hpfs_error(i->i_sb, "fnode %08x has some unknown HPFS386 structures", i->i_ino);
151 } else*/ if (hpfs_sb(i->i_sb)->sb_eas >= 2) { 151 } else*/ if (hpfs_sb(i->i_sb)->sb_eas >= 2) {
152 __le32 ea; 152 __le32 ea;
153 if (!uid_eq(i->i_uid, hpfs_sb(i->i_sb)->sb_uid) || hpfs_inode->i_ea_uid) { 153 if (!uid_eq(i->i_uid, hpfs_sb(i->i_sb)->sb_uid) || hpfs_inode->i_ea_uid) {
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 1a543be09c79..060ba638becb 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -154,7 +154,7 @@ static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
154 /* 154 /*
155 * If we really return the number of allocated & free inodes, some 155 * If we really return the number of allocated & free inodes, some
156 * applications will fail because they won't see enough free inodes. 156 * applications will fail because they won't see enough free inodes.
157 * We'll try to calculate some guess as to how may inodes we can 157 * We'll try to calculate some guess as to how many inodes we can
158 * really allocate 158 * really allocate
159 * 159 *
160 * buf->f_files = atomic_read(&imap->im_numinos); 160 * buf->f_files = atomic_read(&imap->im_numinos);
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index f0edbd84f7bc..0d2bf566e39a 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -870,7 +870,7 @@ int o2net_register_handler(u32 msg_type, u32 key, u32 max_len,
870 /* we've had some trouble with handlers seemingly vanishing. */ 870 /* we've had some trouble with handlers seemingly vanishing. */
871 mlog_bug_on_msg(o2net_handler_tree_lookup(msg_type, key, &p, 871 mlog_bug_on_msg(o2net_handler_tree_lookup(msg_type, key, &p,
872 &parent) == NULL, 872 &parent) == NULL,
873 "couldn't find handler we *just* registerd " 873 "couldn't find handler we *just* registered "
874 "for type %u key %08x\n", msg_type, key); 874 "for type %u key %08x\n", msg_type, key);
875 } 875 }
876 write_unlock(&o2net_handler_lock); 876 write_unlock(&o2net_handler_lock);
diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index b6addf560483..57199a52a351 100644
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -285,7 +285,7 @@ static struct buffer_head *qnx6_check_first_superblock(struct super_block *s,
285 if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) { 285 if (fs32_to_cpu(sbi, sb->sb_magic) == QNX6_SUPER_MAGIC) {
286 /* we got a big endian fs */ 286 /* we got a big endian fs */
287 QNX6DEBUG((KERN_INFO "qnx6: fs got different" 287 QNX6DEBUG((KERN_INFO "qnx6: fs got different"
288 " endianess.\n")); 288 " endianness.\n"));
289 return bh; 289 return bh;
290 } else 290 } else
291 sbi->s_bytesex = BYTESEX_LE; 291 sbi->s_bytesex = BYTESEX_LE;