Commit 7e4a205f authored by Al Viro's avatar Al Viro
Browse files

Revert "get rid of DCACHE_GENOCIDE" 



This reverts commit 57851607.

Unfortunately, while we only call that thing once, the callback
*can* be called more than once for the same dentry - all it
takes is rename_lock being touched while we are in d_walk().
For now let's revert it.

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

fs/dcache.c

+4 −1
Original line number Diff line number Diff line
@@ -3061,8 +3061,11 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry) 
		if (d_unhashed(dentry) || !dentry->d_inode)

			return D_WALK_SKIP;



		if (!(dentry->d_flags & DCACHE_GENOCIDE)) {

			dentry->d_flags |= DCACHE_GENOCIDE;

			dentry->d_lockref.count--;

		}

	}

	return D_WALK_CONTINUE;

}

include/linux/dcache.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct dentry_operations { 
#define DCACHE_DONTCACHE		BIT(7) /* Purge from memory on final dput() */



#define DCACHE_CANT_MOUNT		BIT(8)

#define DCACHE_GENOCIDE			BIT(9)

#define DCACHE_SHRINK_LIST		BIT(10)



#define DCACHE_OP_WEAK_REVALIDATE	BIT(11)