projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
fs
/
jbd2
/
revoke.c
diff --git
a/fs/jbd2/revoke.c
b/fs/jbd2/revoke.c
index
9246e76
..
28cac04
100644
(file)
--- a/
fs/jbd2/revoke.c
+++ b/
fs/jbd2/revoke.c
@@
-68,6
+68,7
@@
#include <linux/list.h>
#include <linux/init.h>
#endif
#include <linux/list.h>
#include <linux/init.h>
#endif
+#include <linux/log2.h>
static struct kmem_cache *jbd2_revoke_record_cache;
static struct kmem_cache *jbd2_revoke_table_cache;
static struct kmem_cache *jbd2_revoke_record_cache;
static struct kmem_cache *jbd2_revoke_table_cache;
@@
-212,7
+213,7
@@
int jbd2_journal_init_revoke(journal_t *journal, int hash_size)
journal->j_revoke = journal->j_revoke_table[0];
/* Check that the hash_size is a power of two */
journal->j_revoke = journal->j_revoke_table[0];
/* Check that the hash_size is a power of two */
- J_ASSERT
((hash_size & (hash_size-1)) == 0
);
+ J_ASSERT
(is_power_of_2(hash_size)
);
journal->j_revoke->hash_size = hash_size;
journal->j_revoke->hash_size = hash_size;
@@
-239,7
+240,7
@@
int jbd2_journal_init_revoke(journal_t *journal, int hash_size)
journal->j_revoke = journal->j_revoke_table[1];
/* Check that the hash_size is a power of two */
journal->j_revoke = journal->j_revoke_table[1];
/* Check that the hash_size is a power of two */
- J_ASSERT
((hash_size & (hash_size-1)) == 0
);
+ J_ASSERT
(is_power_of_2(hash_size)
);
journal->j_revoke->hash_size = hash_size;
journal->j_revoke->hash_size = hash_size;