From 9b844157f86ba1a999b6c6f93f674a9dcbc067ef Mon Sep 17 00:00:00 2001
From: Daniel Rosenberg <drosen@google.com>
Date: Thu, 20 Apr 2017 12:00:30 -0700
Subject: [PATCH] Revert "Android: sdcardfs: Don't do d_add for lower fs"
This reverts commit 60df9f12992bc067216078ae756066c5d7c74d87.
This change caused issues for sdcardfs on top of vfat
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 37231161
Change-Id: Ie56a91fda582af27921cc1a9de7ae19a9a988f2a
---
fs/sdcardfs/lookup.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/sdcardfs/lookup.c b/fs/sdcardfs/lookup.c
index 666f9eb41e78..3ac40fead490 100755
--- a/fs/sdcardfs/lookup.c
+++ b/fs/sdcardfs/lookup.c
@@ -368,15 +368,17 @@ put_name:
dname.len = name->len;
dname.hash = full_name_hash(dname.name, dname.len);
lower_dentry = d_lookup(lower_dir_dentry, &dname);
+ if (lower_dentry)
+ goto setup_lower;
+
+ lower_dentry = d_alloc(lower_dir_dentry, &dname);
if (!lower_dentry) {
- /* We called vfs_path_lookup earlier, and did not get a negative
- * dentry then. Don't confuse the lower filesystem by forcing one
- * on it now...
- */
- err = -ENOENT;
+ err = -ENOMEM;
goto out;
}
+ d_add(lower_dentry, NULL); /* instantiate and hash */
+setup_lower:
lower_path.dentry = lower_dentry;
lower_path.mnt = mntget(lower_dir_mnt);
sdcardfs_set_lower_path(dentry, &lower_path);
--
GitLab