X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Fdcache.c;h=7b8feb6d60c8285234d4dd7cbd82b7604addf484;hb=6724059ae56184656456abd8ef48e135b0c32645;hp=9e5099997fcd8da473bbdf50211873108c4f7194;hpb=c11a255c622e7a2d312f4080c6ef529dd67b3c38;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/dcache.c b/fs/dcache.c
index 9e5099997fcd..7b8feb6d60c8 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1322,8 +1322,11 @@ int d_set_mounted(struct dentry *dentry)
 	}
 	spin_lock(&dentry->d_lock);
 	if (!d_unlinked(dentry)) {
-		dentry->d_flags |= DCACHE_MOUNTED;
-		ret = 0;
+		ret = -EBUSY;
+		if (!d_mountpoint(dentry)) {
+			dentry->d_flags |= DCACHE_MOUNTED;
+			ret = 0;
+		}
 	}
  	spin_unlock(&dentry->d_lock);
 out: