keyring.c (4ba24fef3eb3b142197135223b90ced2f319cd53) keyring.c (ca4da5dd1f99fe9c59f1709fb43e818b18ad20e0)
1/* Keyring handling
2 *
3 * Copyright (C) 2004-2005, 2008, 2013 Red Hat, Inc. All Rights Reserved.
4 * Written by David Howells (dhowells@redhat.com)
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License
8 * as published by the Free Software Foundation; either version

--- 1167 unchanged lines hidden (view full) ---

1176 __releases(&keyring_serialise_link_sem)
1177{
1178 BUG_ON(index_key->type == NULL);
1179 kenter("%d,%s,", keyring->serial, index_key->type->name);
1180
1181 if (index_key->type == &key_type_keyring)
1182 up_write(&keyring_serialise_link_sem);
1183
1/* Keyring handling
2 *
3 * Copyright (C) 2004-2005, 2008, 2013 Red Hat, Inc. All Rights Reserved.
4 * Written by David Howells (dhowells@redhat.com)
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License
8 * as published by the Free Software Foundation; either version

--- 1167 unchanged lines hidden (view full) ---

1176 __releases(&keyring_serialise_link_sem)
1177{
1178 BUG_ON(index_key->type == NULL);
1179 kenter("%d,%s,", keyring->serial, index_key->type->name);
1180
1181 if (index_key->type == &key_type_keyring)
1182 up_write(&keyring_serialise_link_sem);
1183
1184 if (edit && !edit->dead_leaf) {
1185 key_payload_reserve(keyring,
1186 keyring->datalen - KEYQUOTA_LINK_BYTES);
1184 if (edit) {
1185 if (!edit->dead_leaf) {
1186 key_payload_reserve(keyring,
1187 keyring->datalen - KEYQUOTA_LINK_BYTES);
1188 }
1187 assoc_array_cancel_edit(edit);
1188 }
1189 up_write(&keyring->sem);
1190}
1191
1192/**
1193 * key_link - Link a key to a keyring
1194 * @keyring: The keyring to make the link in.

--- 200 unchanged lines hidden --- 		1189 assoc_array_cancel_edit(edit);
1190 }
1191 up_write(&keyring->sem);
1192}
1193
1194/**
1195 * key_link - Link a key to a keyring
1196 * @keyring: The keyring to make the link in.

--- 200 unchanged lines hidden ---