diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
| commit | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (patch) | |
| tree | 1a24a0ad0c33e1d6344d2454b61748afb74a6693 /fs/dcache.c | |
| parent | cb370744bc101be91a0bc3e9fbdb670ab44df97d (diff) | |
| parent | d9e0350d2575a20ee7783427da9bd6b6107eb983 (diff) | |
Merge tag 'v4.1.39' into linux-linaro-lsk-v4.1lsk-v4.1-17.03
This is the 4.1.39 stable release
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 660857431b1c..11d466bbfb0b 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: |