ANDROID: sdcardfs: Use spin_lock_nested
authorDaniel Rosenberg <drosen@google.com>
Thu, 9 Mar 2017 01:11:51 +0000 (17:11 -0800)
committerDaniel Rosenberg <drosen@google.com>
Tue, 30 Jan 2018 03:40:05 +0000 (19:40 -0800)
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 36007653
Change-Id: I805d5afec797669679853fb2bb993ee38e6276e4

fs/sdcardfs/dentry.c

index f22de8add10ce3db8dd1b2b5cace6c54f1d754d2..d1eff456cc8adabf39526dde760f830469340a95 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) {