commit 65239940be4997254a81127d4dcfc0a9480fd01f
author Khusika Dhamar Gusti <khusikadhamar@gmail.com> Sat Aug 03 08:45:59 2019 +0700
committer Khusika Dhamar Gusti <khusikadhamar@gmail.com> Thu Aug 08 19:46:39 2019 +0700
tree 07141435ad59724f03187af4074fab67a249054b
parent 4ebd29edafc119a52b6ccc43d9c62341634544d5

fs/crypto: Fix 4.9.186 missmerge

This has been removed in this commit 63da420

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

fs/crypto/policy.c

diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 6ef78cd..3da9b25 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -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