Merge "ext4/fscrypto: avoid RCU lookup in d_revalidate" (f4bc6601) · Commits · e / devices / android_kernel_sony_msm8998

fs/ext4/crypto.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#include <linux/random.h>
		#include <linux/scatterlist.h>
		#include <linux/spinlock_types.h>
		#include <linux/namei.h>

		#include "ext4_extents.h"
		#include "xattr.h"
		@@ -487,6 +488,9 @@ static int ext4_d_revalidate(struct dentry *dentry, unsigned int flags)
		struct ext4_crypt_info *ci;
		int dir_has_key, cached_with_key;

		if (flags & LOOKUP_RCU)
		return -ECHILD;

		dir = dget_parent(dentry);
		if (!ext4_encrypted_inode(d_inode(dir))) {
		dput(dir);