aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2017-03-08 17:11:51 -0800
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:35:18 +0200
commitdf1d216cd1cf586a3681e99f8614de9f6811d30c (patch)
tree7eacffdbeea7a0e16663d18a9e609b0e858a2ee7
parente2da9b7973ae3dc2dde1094091add50b77c79c12 (diff)
ANDROID: sdcardfs: Use spin_lock_nested
Signed-off-by: Daniel Rosenberg <drosen@google.com> Bug: 36007653 Change-Id: I805d5afec797669679853fb2bb993ee38e6276e4
-rwxr-xr-xfs/sdcardfs/dentry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sdcardfs/dentry.c b/fs/sdcardfs/dentry.c
index b2fa36f13..f03f16d3e 100755
--- 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) {