Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0632a9ac authored by Al Viro's avatar Al Viro
Browse files

take write_seqcount_invalidate() into __d_drop() 



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

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8cc07c80

fs/dcache.c

+22 −22
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ static void dentry_lru_add(struct dentry *dentry) 
 */

static void ___d_drop(struct dentry *dentry)

{

	if (!d_unhashed(dentry)) {

	struct hlist_bl_head *b;

	/*

	 * 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_del(&dentry->d_hash);

	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)

{

	if (!d_unhashed(dentry)) {

		___d_drop(dentry);

		dentry->d_hash.pprev = NULL;

		write_seqcount_invalidate(&dentry->d_seq);

	}

}

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);



	/* unhash both */

	/* ___d_drop does write_seqcount_barrier, but they're OK to nest. */

	if (!d_unhashed(dentry))

		___d_drop(dentry);

	if (!d_unhashed(target))

		___d_drop(target);



	/* Switch the names.. */