Revert "UBUNTU: SAUCE: fixup: 20/23 locking issue around in __label_update"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit bd0bf02f160e39b34a63a8ab35ab34fff74efb40.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

security/apparmor/label.c

@@ -1844,7 +1844,7 @@ static struct aa_label *__label_update(struct aa_label *label)
 	if (invcount) {
 		l->size -= aa_sort_and_merge_profiles(l->size, &l->ent[0]);
 		if (labels_set(label) != labels_set(l)) {
-			__aa_label_remove(labels_set(label), label, l);
+			aa_label_remove(labels_set(label), label);
 			write_unlock_irqrestore(&ls->lock, flags);
 			tmp = aa_label_insert(labels_set(l), l);
 			goto out;