projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
security
/
apparmor
/
apparmorfs.c
diff --git
a/security/apparmor/apparmorfs.c
b/security/apparmor/apparmorfs.c
index
729e595
..
5923d56
100644
(file)
--- a/
security/apparmor/apparmorfs.c
+++ b/
security/apparmor/apparmorfs.c
@@
-381,7
+381,7
@@
void __aa_fs_profile_migrate_dents(struct aa_profile *old,
for (i = 0; i < AAFS_PROF_SIZEOF; i++) {
new->dents[i] = old->dents[i];
if (new->dents[i])
- new->dents[i]->d_inode->i_mtime =
CURRENT_TIME
;
+ new->dents[i]->d_inode->i_mtime =
current_time(new->dents[i]->d_inode)
;
old->dents[i] = NULL;
}
}