fs/crypto: Fix 4.9.186 missmerge



This has been removed in this commit e6b120d4

Change-Id: If1db3703d7b70ba9c820168d2abe967a2d026959
Signed-off-by: Khusika Dhamar Gusti <khusikadhamar@gmail.com>

parent d4fff2d0

fs/crypto/policy.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -82,8 +82,6 @@ int fscrypt_ioctl_set_policy(struct file filp, const void __user arg)
		ret = -ENOTDIR;
		else if (IS_DEADDIR(inode))
		ret = -ENOENT;
		else if (!inode->i_sb->s_cop->empty_dir)
		ret = -EOPNOTSUPP;
		else if (!inode->i_sb->s_cop->empty_dir(inode))
		ret = -ENOTEMPTY;
		else