Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

take write_seqcount_invalidate() into __d_drop()

Browse source 
... and reorder it with making d_unhashed() true.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-03-07 00:49:10 -05:00
parent 8cc07c808c
commit 0632a9ac7b
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/dcache.c
View file

@ -470,7 +470,6 @@ static void dentry_lru_add(struct dentry *dentry)
*/ */
static void ___d_drop(struct dentry *dentry) static void ___d_drop(struct dentry *dentry)
{ {
if (!d_unhashed(dentry)) {
struct hlist_bl_head *b; struct hlist_bl_head *b;
/* /*
* Hashed dentries are normally on the dentry hashtable, * Hashed dentries are normally on the dentry hashtable,
@ -485,15 +484,15 @@ static void ___d_drop(struct dentry *dentry)
hlist_bl_lock(b); hlist_bl_lock(b);
__hlist_bl_del(&dentry->d_hash); __hlist_bl_del(&dentry->d_hash);
hlist_bl_unlock(b); hlist_bl_unlock(b);
/* After this call, in-progress rcu-walk path lookup will fail. */
write_seqcount_invalidate(&dentry->d_seq);
}
} }
void __d_drop(struct dentry *dentry) void __d_drop(struct dentry *dentry)
{ {
if (!d_unhashed(dentry)) {
___d_drop(dentry); ___d_drop(dentry);
dentry->d_hash.pprev = NULL; dentry->d_hash.pprev = NULL;
write_seqcount_invalidate(&dentry->d_seq);
}
} }
EXPORT_SYMBOL(__d_drop); EXPORT_SYMBOL(__d_drop);
@ -2853,8 +2852,9 @@ static void __d_move(struct dentry *dentry, struct dentry *target,
write_seqcount_begin_nested(&target->d_seq, DENTRY_D_LOCK_NESTED); write_seqcount_begin_nested(&target->d_seq, DENTRY_D_LOCK_NESTED);
/* unhash both */ /* unhash both */
/* ___d_drop does write_seqcount_barrier, but they're OK to nest. */ if (!d_unhashed(dentry))
___d_drop(dentry); ___d_drop(dentry);
if (!d_unhashed(target))
___d_drop(target); ___d_drop(target);
/* Switch the names.. */ /* Switch the names.. */