sdcardfs: Fix build for linux-3.10.y

* Fix compilation after 6637ecd

diff --git a/fs/sdcardfs/derived_perm.c b/fs/sdcardfs/derived_perm.c
index 5ad69e6f6c3395d3a10aa22200d2a90c0d908f2c..85e60e8f21f39c52c7f20f490514c968c1727e54 100644 (file)
--- a/fs/sdcardfs/derived_perm.c
+++ b/fs/sdcardfs/derived_perm.c
@@ -267,7 +267,7 @@ void fixup_perms_recursive(struct dentry *dentry, struct limit_search *limit) {
 
        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 (!(limit->flags & BY_NAME) || !strncasecmp(child->d_name.name, limit->name, limit->length)) {
                                if (child->d_inode) {
@@ -282,7 +282,7 @@ void fixup_perms_recursive(struct dentry *dentry, struct limit_search *limit) {
                spin_unlock(&dentry->d_lock);
        } else  if (descendant_may_need_fixup(info, limit)) {
                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, limit);
                }
                spin_unlock(&dentry->d_lock);
@@ -297,7 +297,7 @@ void drop_recursive(struct dentry *parent) {
                return;
        info = SDCARDFS_I(parent->d_inode);
        spin_lock(&parent->d_lock);
-       list_for_each_entry(dentry, &parent->d_subdirs, d_u.d_child) {
+       list_for_each_entry(dentry, &parent->d_subdirs, d_child) {
                if (dentry->d_inode) {
                        if (SDCARDFS_I(parent->d_inode)->top != SDCARDFS_I(dentry->d_inode)->top) {
                                drop_recursive(dentry);
@@ -316,7 +316,7 @@ void fixup_top_recursive(struct dentry *parent) {
                return;
        info = SDCARDFS_I(parent->d_inode);
        spin_lock(&parent->d_lock);
-       list_for_each_entry(dentry, &parent->d_subdirs, d_u.d_child) {
+       list_for_each_entry(dentry, &parent->d_subdirs, d_child) {
                if (dentry->d_inode) {
                        if (SDCARDFS_I(parent->d_inode)->top != SDCARDFS_I(dentry->d_inode)->top) {
                                get_derived_permission(parent, dentry);

diff --git a/fs/sdcardfs/lookup.c b/fs/sdcardfs/lookup.c
index 87b47e34d80d4aea662bafc5918f63dd2daa8fcd..9e860dcf5718735325eef3be2aea4135f5d3ed86 100644 (file)
--- a/fs/sdcardfs/lookup.c
+++ b/fs/sdcardfs/lookup.c
@@ -246,7 +246,7 @@ static struct dentry *__sdcardfs_lookup(struct dentry *dentry,
                struct dentry *match = NULL;
                mutex_lock(&lower_dir_dentry->d_inode->i_mutex);
                spin_lock(&lower_dir_dentry->d_lock);
-               list_for_each_entry(child, &lower_dir_dentry->d_subdirs, d_u.d_child) {
+               list_for_each_entry(child, &lower_dir_dentry->d_subdirs, d_child) {
                        if (child && child->d_inode) {
                                if (qstr_case_eq(&child->d_name, name)) {
                                        match = dget(child);