diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-20 16:13:58 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-20 16:13:58 -0800 |
commit | 8ebbfb49574818f07a25bc119b1bbdf1c2853a39 (patch) | |
tree | e7b1ea6c6a3ea522654c685f2f0c9f41466fdcf9 /fs/inode.c | |
parent | 39e255dab5a993cbebb35598015da1d4a0eb3727 (diff) | |
parent | 847c9db5cb50841589b8ebd3da0769b1b02fb3b2 (diff) | |
download | kernel_goldelico_gta04-8ebbfb49574818f07a25bc119b1bbdf1c2853a39.zip kernel_goldelico_gta04-8ebbfb49574818f07a25bc119b1bbdf1c2853a39.tar.gz kernel_goldelico_gta04-8ebbfb49574818f07a25bc119b1bbdf1c2853a39.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Assorted fixes, sat in -next for a week or so...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ocfs2: deal with wraparounds of i_nlink in ocfs2_rename()
vfs: fix compat_sys_stat() handling of overflows in st_nlink
quota: Fix deadlock with suspend and quotas
vfs: Provide function to get superblock and wait for it to thaw
vfs: fix panic in __d_lookup() with high dentry hashtable counts
autofs4 - fix lockdep splat in autofs
vfs: fix d_inode_lookup() dentry ref leak
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1651,7 +1651,7 @@ __setup("ihash_entries=", set_ihash_entries); */ void __init inode_init_early(void) { - int loop; + unsigned int loop; /* If hashes are distributed across NUMA nodes, defer * hash allocation until vmalloc space is available. @@ -1669,13 +1669,13 @@ void __init inode_init_early(void) &i_hash_mask, 0); - for (loop = 0; loop < (1 << i_hash_shift); loop++) + for (loop = 0; loop < (1U << i_hash_shift); loop++) INIT_HLIST_HEAD(&inode_hashtable[loop]); } void __init inode_init(void) { - int loop; + unsigned int loop; /* inode slab cache */ inode_cachep = kmem_cache_create("inode_cache", @@ -1699,7 +1699,7 @@ void __init inode_init(void) &i_hash_mask, 0); - for (loop = 0; loop < (1 << i_hash_shift); loop++) + for (loop = 0; loop < (1U << i_hash_shift); loop++) INIT_HLIST_HEAD(&inode_hashtable[loop]); } |