Merge tag 'iwlwifi-next-for-kalle-2015-06-03' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / security / tomoyo / condition.c

diff --git a/security/tomoyo/condition.c b/security/tomoyo/condition.c
index 63681e8be62868cb69e691619d9aa4068babb3f8..6c4528d4b48f8b5cdfaad0b072fc7afe6f17e1ff 100644 (file)
--- a/security/tomoyo/condition.c
+++ b/security/tomoyo/condition.c
@@ -714,7 +714,7 @@ void tomoyo_get_attributes(struct tomoyo_obj_info *obj)
                        dentry = dget_parent(dentry);
                        break;
                }
-               inode = dentry->d_inode;
+               inode = d_backing_inode(dentry);
                if (inode) {
                        struct tomoyo_mini_stat *stat = &obj->stat[i];
                        stat->uid  = inode->i_uid;