projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-fixes-3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
security
/
keys
/
keyring.c
diff --git
a/security/keys/keyring.c
b/security/keys/keyring.c
index
69f0cb7
..
d46cbc5
100644
(file)
--- a/
security/keys/keyring.c
+++ b/
security/keys/keyring.c
@@
-160,7
+160,7
@@
static u64 mult_64x32_and_fold(u64 x, u32 y)
static unsigned long hash_key_type_and_desc(const struct keyring_index_key *index_key)
{
const unsigned level_shift = ASSOC_ARRAY_LEVEL_STEP;
static unsigned long hash_key_type_and_desc(const struct keyring_index_key *index_key)
{
const unsigned level_shift = ASSOC_ARRAY_LEVEL_STEP;
- const unsigned long
level_mask = ASSOC_ARRAY_LEVEL_STEP
_MASK;
+ const unsigned long
fan_mask = ASSOC_ARRAY_FAN
_MASK;
const char *description = index_key->description;
unsigned long hash, type;
u32 piece;
const char *description = index_key->description;
unsigned long hash, type;
u32 piece;
@@
-194,10
+194,10
@@
static unsigned long hash_key_type_and_desc(const struct keyring_index_key *inde
* ordinary keys by making sure the lowest level segment in the hash is
* zero for keyrings and non-zero otherwise.
*/
* ordinary keys by making sure the lowest level segment in the hash is
* zero for keyrings and non-zero otherwise.
*/
- if (index_key->type != &key_type_keyring && (hash &
level
_mask) == 0)
+ if (index_key->type != &key_type_keyring && (hash &
fan
_mask) == 0)
return hash | (hash >> (ASSOC_ARRAY_KEY_CHUNK_SIZE - level_shift)) | 1;
return hash | (hash >> (ASSOC_ARRAY_KEY_CHUNK_SIZE - level_shift)) | 1;
- if (index_key->type == &key_type_keyring && (hash &
level
_mask) != 0)
- return (hash + (hash << level_shift)) & ~
level
_mask;
+ if (index_key->type == &key_type_keyring && (hash &
fan
_mask) != 0)
+ return (hash + (hash << level_shift)) & ~
fan
_mask;
return hash;
}
return hash;
}
@@
-279,12
+279,11
@@
static bool keyring_compare_object(const void *object, const void *data)
* Compare the index keys of a pair of objects and determine the bit position
* at which they differ - if they differ.
*/
* Compare the index keys of a pair of objects and determine the bit position
* at which they differ - if they differ.
*/
-static int keyring_diff_objects(const void *
_a, const void *_b
)
+static int keyring_diff_objects(const void *
object, const void *data
)
{
{
- const struct key *key_a = keyring_ptr_to_key(_a);
- const struct key *key_b = keyring_ptr_to_key(_b);
+ const struct key *key_a = keyring_ptr_to_key(object);
const struct keyring_index_key *a = &key_a->index_key;
const struct keyring_index_key *a = &key_a->index_key;
- const struct keyring_index_key *b =
&key_b->index_key
;
+ const struct keyring_index_key *b =
data
;
unsigned long seg_a, seg_b;
int level, i;
unsigned long seg_a, seg_b;
int level, i;
@@
-691,8
+690,8
@@
descend_to_node:
smp_read_barrier_depends();
ptr = ACCESS_ONCE(shortcut->next_node);
BUG_ON(!assoc_array_ptr_is_node(ptr));
smp_read_barrier_depends();
ptr = ACCESS_ONCE(shortcut->next_node);
BUG_ON(!assoc_array_ptr_is_node(ptr));
- node = assoc_array_ptr_to_node(ptr);
}
}
+ node = assoc_array_ptr_to_node(ptr);
begin_node:
kdebug("begin_node");
begin_node:
kdebug("begin_node");