PM / Hibernate: Return error code when alloc_image_page() fails

[mv-sheeva.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index ffb7bbad063813713461f394b868decd8588ba41..b24d7027b83c29b067bdc56f27ae28bf2d16c464 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -916,7 +916,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
 
        parent = dentry->d_parent;
        spin_lock(&parent->d_lock);
-       spin_lock(&dentry->d_lock);
+       spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
        list_del_init(&dentry->d_u.d_child);
        spin_unlock(&dentry->d_lock);
        spin_unlock(&parent->d_lock);