Drop broken 4.4 f2fs patch

diff --git a/queue-4.4/f2fs-don-t-allow-encrypted-operations-without-keys.patch b/queue-4.4/f2fs-don-t-allow-encrypted-operations-without-keys.patch
deleted file mode 100644 (file)
index 05a82e8..0000000
--- a/queue-4.4/f2fs-don-t-allow-encrypted-operations-without-keys.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 363fa4e078cbdc97a172c19d19dc04b41b52ebc8 Mon Sep 17 00:00:00 2001
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-Date: Wed, 28 Dec 2016 17:31:15 -0800
-Subject: f2fs: don't allow encrypted operations without keys
-
-From: Jaegeuk Kim <jaegeuk@kernel.org>
-
-commit 363fa4e078cbdc97a172c19d19dc04b41b52ebc8 upstream.
-
-This patch fixes the renaming bug on encrypted filenames, which was pointed by
-
- (ext4: don't allow encrypted operations without keys)
-
-Cc: Theodore Ts'o <tytso@mit.edu>
-Reviewed-by: Chao Yu <yuchao0@huawei.com>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/f2fs/namei.c |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/fs/f2fs/namei.c
-+++ b/fs/f2fs/namei.c
-@@ -597,6 +597,12 @@ static int f2fs_rename(struct inode *old
-       struct f2fs_dir_entry *new_entry;
-       int err = -ENOENT;
- 
-+      if ((f2fs_encrypted_inode(old_dir) &&
-+                      !fscrypt_has_encryption_key(old_dir)) ||
-+                      (f2fs_encrypted_inode(new_dir) &&
-+                      !fscrypt_has_encryption_key(new_dir)))
-+              return -ENOKEY;
-+
-       if ((old_dir != new_dir) && f2fs_encrypted_inode(new_dir) &&
-               !f2fs_is_child_context_consistent_with_parent(new_dir,
-                                                       old_inode)) {
-@@ -755,6 +761,12 @@ static int f2fs_cross_rename(struct inod
-       int old_nlink = 0, new_nlink = 0;
-       int err = -ENOENT;
- 
-+      if ((f2fs_encrypted_inode(old_dir) &&
-+                      !fscrypt_has_encryption_key(old_dir)) ||
-+                      (f2fs_encrypted_inode(new_dir) &&
-+                      !fscrypt_has_encryption_key(new_dir)))
-+              return -ENOKEY;
-+
-       if ((f2fs_encrypted_inode(old_dir) || f2fs_encrypted_inode(new_dir)) &&
-               (old_dir != new_dir) &&
-               (!f2fs_is_child_context_consistent_with_parent(new_dir,

diff --git a/queue-4.4/series b/queue-4.4/series
index da7c060e308cfeb757ee37b64d14527c3ac4cbd8..a088126050238c1c5c005ec73a4f6d941a1c4c83 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -46,4 +46,3 @@ sched-cpuset-pm-fix-cpuset-vs.-suspend-resume-bugs.patch
 ext4-fix-data-corruption-for-mmap-writes.patch
 ext4-don-t-clear-sgid-when-inheriting-acls.patch
 ext4-don-t-allow-encrypted-operations-without-keys.patch
-f2fs-don-t-allow-encrypted-operations-without-keys.patch