ANDROID: sdcardfs: Use spin_lock_nested
authorDaniel Rosenberg <drosen@google.com>
Thu, 9 Mar 2017 01:11:51 +0000 (17:11 -0800)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 10 Apr 2017 07:42:16 +0000 (13:12 +0530)
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 36007653
Change-Id: I805d5afec797669679853fb2bb993ee38e6276e4

fs/sdcardfs/dentry.c

index 971928ab6c216eeea41db43fd47566001329ab65..e6f8e9edf8a96d4b8569f3d2eac6fe24fa269fb1 100644 (file)
@@ -76,10 +76,10 @@ static int sdcardfs_d_revalidate(struct dentry *dentry, unsigned int flags)
 
        if (dentry < lower_dentry) {
                spin_lock(&dentry->d_lock);
-               spin_lock(&lower_dentry->d_lock);
+               spin_lock_nested(&lower_dentry->d_lock, DENTRY_D_LOCK_NESTED);
        } else {
                spin_lock(&lower_dentry->d_lock);
-               spin_lock(&dentry->d_lock);
+               spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
        }
 
        if (dentry->d_name.len != lower_dentry->d_name.len) {