X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=fs%2Fdcache.c;h=95d71eda81420a506c5a1f4a4f5283b31310d5e4;hb=7a92cc6bcbc90bf72e57eff2dc29900a636c2d0d;hp=769903dbc19df53199b4aca2e79607145e179c98;hpb=1c681a1921e55628abd9cde2431c166ef8a6b993;p=mirror_ubuntu-zesty-kernel.git

diff --git a/fs/dcache.c b/fs/dcache.c
index 769903dbc19d..95d71eda8142 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1336,8 +1336,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: