drop 4.4 btrfs patch that would not apply.

diff --git a/queue-4.4/btrfs-use-down_read_nested-to-make-lockdep-silent.patch b/queue-4.4/btrfs-use-down_read_nested-to-make-lockdep-silent.patch
deleted file mode 100644 (file)
index 9a3a3d3..0000000
--- a/queue-4.4/btrfs-use-down_read_nested-to-make-lockdep-silent.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From foo@baz Fri Aug  4 15:15:51 PDT 2017
-From: Liu Bo <bo.li.liu@oracle.com>
-Date: Wed, 30 Nov 2016 16:11:04 -0800
-Subject: Btrfs: use down_read_nested to make lockdep silent
-
-From: Liu Bo <bo.li.liu@oracle.com>
-
-
-[ Upstream commit e321f8a801d7b4c40da8005257b05b9c2b51b072 ]
-
-If @block_group is not @used_bg, it'll try to get @used_bg's lock without
-droping @block_group 's lock and lockdep has throwed a scary deadlock warning
-about it.
-Fix it by using down_read_nested.
-
-Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
-Reviewed-by: David Sterba <dsterba@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/btrfs/extent-tree.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
-index e46e7fbe1b34..14a37ff0b9e3 100644
---- a/fs/btrfs/extent-tree.c
-+++ b/fs/btrfs/extent-tree.c
-@@ -7401,7 +7401,8 @@ btrfs_lock_cluster(struct btrfs_block_group_cache *block_group,
- 
-               spin_unlock(&cluster->refill_lock);
- 
--              down_read(&used_bg->data_rwsem);
-+              /* We should only have one-level nested. */
-+              down_read_nested(&used_bg->data_rwsem, SINGLE_DEPTH_NESTING);
- 
-               spin_lock(&cluster->refill_lock);
-               if (used_bg == cluster->block_group)
--- 
-2.13.4
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 6c26e806c7be1fc4524445a12a40b3fb895385c5..f16fd75be11ae7e3ef5e25b0e0dfbdb2135241dc 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -88,4 +88,3 @@ hid-ignore-petzl-usb-headlamp.patch
 scsi-fnic-avoid-sending-reset-to-firmware-when-another-reset-is-in-progress.patch
 scsi-snic-return-error-code-on-memory-allocation-failure.patch
 asoc-dpcm-avoid-putting-stream-state-to-stop-when-fe-stream-is-paused.patch
-btrfs-use-down_read_nested-to-make-lockdep-silent.patch