From: Daniel Rosenberg <drosen@google.com>
Date: Thu, 9 Mar 2017 01:11:51 +0000 (-0800)
Subject: ANDROID: sdcardfs: Use spin_lock_nested
X-Git-Tag: release-20171130_firefly~4^2~100^2~206
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2a9fca6e53c1969941d29f41931f24dd7a73926f;p=firefly-linux-kernel-4.4.55.git

ANDROID: sdcardfs: Use spin_lock_nested

Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 36007653
Change-Id: I805d5afec797669679853fb2bb993ee38e6276e4
---

diff --git a/fs/sdcardfs/dentry.c b/fs/sdcardfs/dentry.c
index 971928ab6c21..e6f8e9edf8a9 100644
--- a/fs/sdcardfs/dentry.c
+++ b/fs/sdcardfs/dentry.c
@@ -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) {