diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:08 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:08 +0800 |
commit | 96195c7a758055f7c1a77b7070050c12eb949883 (patch) | |
tree | c7327af2be21ef3c4a6a712a2f9f345b16197a02 /fs/dcache.c | |
parent | c8a04d19821f8ee3ba047681cf23f46722caf596 (diff) | |
parent | ffc4aa8f521606f63f59ff708f49780172909e94 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.06-rt
Diffstat (limited to 'fs/dcache.c')
-rw-r--r-- | fs/dcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 40c561106e90..58c5dd7c9c82 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1619,7 +1619,7 @@ struct dentry *d_alloc(struct dentry * parent, const struct qstr *name) struct dentry *dentry = __d_alloc(parent->d_sb, name); if (!dentry) return NULL; - + dentry->d_flags |= DCACHE_RCUACCESS; spin_lock(&parent->d_lock); /* * don't need child lock because it is not subject @@ -2414,7 +2414,6 @@ static void __d_rehash(struct dentry * entry, struct hlist_bl_head *b) { BUG_ON(!d_unhashed(entry)); hlist_bl_lock(b); - entry->d_flags |= DCACHE_RCUACCESS; hlist_bl_add_head_rcu(&entry->d_hash, b); hlist_bl_unlock(b); } @@ -2633,6 +2632,7 @@ static void __d_move(struct dentry *dentry, struct dentry *target, /* ... and switch them in the tree */ if (IS_ROOT(dentry)) { /* splicing a tree */ + dentry->d_flags |= DCACHE_RCUACCESS; dentry->d_parent = target->d_parent; target->d_parent = target; list_del_init(&target->d_child); |