Messages in this thread Patch in this message | | | Date | Sun, 18 May 2014 09:45:35 +0200 | From | Fabian Frederick <> | Subject | [PATCH 1/1] fs/jbd2/revoke.c: replace shift loop by fls |
| |
jbd2_journal_init_revoke is only called with positive hash_size (JOURNAL_REVOKE_DEFAULT_HASH) so we can replace loop shift by fls -1
Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Joe Perches <joe@perches.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> --- fs/jbd2/revoke.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c index 198c9c1..811d14b 100644 --- a/fs/jbd2/revoke.c +++ b/fs/jbd2/revoke.c @@ -227,19 +227,15 @@ record_cache_failure: static struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size) { - int shift = 0; - int tmp = hash_size; + int i; struct jbd2_revoke_table_s *table; table = kmem_cache_alloc(jbd2_revoke_table_cache, GFP_KERNEL); if (!table) goto out; - while((tmp >>= 1UL) != 0UL) - shift++; - table->hash_size = hash_size; - table->hash_shift = shift; + table->hash_shift = fls(hash_size) - 1; table->hash_table = kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); if (!table->hash_table) { @@ -248,8 +244,8 @@ static struct jbd2_revoke_table_s *jbd2_journal_init_revoke_table(int hash_size) goto out; } - for (tmp = 0; tmp < hash_size; tmp++) - INIT_LIST_HEAD(&table->hash_table[tmp]); + for (i = 0; i < hash_size; i++) + INIT_LIST_HEAD(&table->hash_table[i]); out: return table; -- 1.8.4.5
| |