projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM64: dts: rockchip: rk3399: set dummy_cpll and dummy_vpll as fixed clk
[firefly-linux-kernel-4.4.55.git]
/
fs
/
dcache.c
diff --git
a/fs/dcache.c
b/fs/dcache.c
index 71b6056ad35dc0765c5d188ba30f2c3534495327..7b8feb6d60c8285234d4dd7cbd82b7604addf484 100644
(file)
--- 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)) {
}
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:
}
spin_unlock(&dentry->d_lock);
out:
@@
-3023,6
+3026,7
@@
char *d_absolute_path(const struct path *path,
return ERR_PTR(error);
return res;
}
return ERR_PTR(error);
return res;
}
+EXPORT_SYMBOL(d_absolute_path);
/*
* same as __d_path but appends "(deleted)" for unlinked files.
/*
* same as __d_path but appends "(deleted)" for unlinked files.