diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:38:35 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:38:35 -0700 |
| commit | 07c57548539dbeeb3c4d3766b02eaf4b2d945f8f (patch) | |
| tree | d0e53e8e213fa26a151367f60c7699f5719d898e /fs/dcache.c | |
| parent | 977826e7012c4efebcb5b923d15455ebd468b579 (diff) | |
| parent | 8a7eb06341c73248d152a2a12e4f00f472295de7 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.08-android
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 87cf545feeeb..8a5fa6a3ab6b 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -587,6 +587,9 @@ repeat: if (unlikely(d_unhashed(dentry))) goto kill_it; + if (unlikely(dentry->d_flags & DCACHE_DISCONNECTED)) + goto kill_it; + if (unlikely(dentry->d_flags & DCACHE_OP_DELETE)) { if (dentry->d_op->d_delete(dentry)) goto kill_it; |