projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
media: ov7740: constify structures stored in fields of v4l2_subdev_ops structure
[linux-2.6-block.git]
/
security
/
apparmor
/
file.c
diff --git
a/security/apparmor/file.c
b/security/apparmor/file.c
index 4285943f7260f36f271b7d7ad773345fb84d97f0..d0afed9ebd0ed9cac3a4803f6f1622959802c9d9 100644
(file)
--- a/
security/apparmor/file.c
+++ b/
security/apparmor/file.c
@@
-496,7
+496,7
@@
static void update_file_ctx(struct aa_file_ctx *fctx, struct aa_label *label,
/* update caching of label on file_ctx */
spin_lock(&fctx->lock);
old = rcu_dereference_protected(fctx->label,
-
spin_is_locke
d(&fctx->lock));
+
lockdep_is_hel
d(&fctx->lock));
l = aa_label_merge(old, label, GFP_ATOMIC);
if (l) {
if (l != old) {