aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMister Oyster <oysterized@gmail.com>2017-03-26 20:23:08 +0200
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:32:17 +0200
commit2bf8729ad3b8eafb81897916a867185d3f05e369 (patch)
treedd088e9b86ca72c6e87c53186dbcadbc080149a4
parent2876aabac321db19995d403808ff4312bca51d2a (diff)
downloadandroid_kernel_m2note-2bf8729ad3b8eafb81897916a867185d3f05e369.tar.gz
sdcardfs: Fix issue with d_child move
reapply https://github.com/Moyster/android_kernel_m2note/commit/7d7dc43c76bc4f83cbb1c5533fd8bf6c0577fedf
-rwxr-xr-xfs/sdcardfs/derived_perm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sdcardfs/derived_perm.c b/fs/sdcardfs/derived_perm.c
index 4b876455d..f8289c5de 100755
--- a/fs/sdcardfs/derived_perm.c
+++ b/fs/sdcardfs/derived_perm.c
@@ -142,7 +142,7 @@ void fixup_perms_recursive(struct dentry *dentry, const char* name, size_t len)
if (needs_fixup(info->perm)) {
spin_lock(&dentry->d_lock);
- list_for_each_entry(child, &dentry->d_subdirs, d_u.d_child) {
+ list_for_each_entry(child, &dentry->d_subdirs, d_child) {
dget(child);
if (!strncasecmp(child->d_name.name, name, len)) {
if (child->d_inode) {
@@ -157,7 +157,7 @@ void fixup_perms_recursive(struct dentry *dentry, const char* name, size_t len)
spin_unlock(&dentry->d_lock);
} else if (descendant_may_need_fixup(info->perm)) {
spin_lock(&dentry->d_lock);
- list_for_each_entry(child, &dentry->d_subdirs, d_u.d_child) {
+ list_for_each_entry(child, &dentry->d_subdirs, d_child) {
fixup_perms_recursive(child, name, len);
}
spin_unlock(&dentry->d_lock);