delete patch later reverted in 32 series

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 1 insertions, 103 deletions

diff --git a/audit/from-v2.6.32/audit.txt b/audit/from-v2.6.32/audit.txt
index 44ae333..188c72d 100644
--- a/audit/from-v2.6.32/audit.txt
+++ b/audit/from-v2.6.32/audit.txt
@@ -3088,7 +3088,7 @@ d23b7b62 	86c4f6d8	v3.0-rc1	n
 45b0dfab 	26afb7c6	v3.0-rc1	n
 d9296aeb 	431e1eca	v3.0-rc1	n
 5e4c1dbf 	0a58e077	v3.0-rc1	n
-5b2745db 	02e35228	v2.6.39		n
+5b2745db 	02e35228	v2.6.39		n/a	reverted in 32.44
 24fb3f4c 	ad5d5292	v3.0-rc1	n
 c3bf5293 	3d2cea73	v3.0-rc1	n
 301808c5 	98586ed8	v3.0-rc1	n
diff --git a/queue/block-rescan-partitions-on-invalidated-devices-on-EN.patch b/queue/block-rescan-partitions-on-invalidated-devices-on-EN.patch
deleted file mode 100644
index 7075b5f..0000000
--- a/queue/block-rescan-partitions-on-invalidated-devices-on-EN.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From f57e642aa440902506ddeb9686571afe67f000f3 Mon Sep 17 00:00:00 2001
-From: Tejun Heo <tj@kernel.org>
-Date: Fri, 29 Apr 2011 10:15:20 +0200
-Subject: [PATCH] block: rescan partitions on invalidated devices on -ENOMEDIA
- too
-
-commit 02e352287a40bd456eb78df705bf888bc3161d3f upstream.
-
-__blkdev_get() doesn't rescan partitions if disk->fops->open() fails,
-which leads to ghost partition devices lingering after medimum removal
-is known to both the kernel and userland.  The behavior also creates a
-subtle inconsistency where O_NONBLOCK open, which doesn't fail even if
-there's no medium, clears the ghots partitions, which is exploited to
-work around the problem from userland.
-
-Fix it by updating __blkdev_get() to issue partition rescan after
--ENOMEDIA too.
-
-This was reported in the following bz.
-
- https://bugzilla.kernel.org/show_bug.cgi?id=13029
-
-Stable: 2.6.38
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Reported-by: David Zeuthen <zeuthen@gmail.com>
-Reported-by: Martin Pitt <martin.pitt@ubuntu.com>
-Reported-by: Kay Sievers <kay.sievers@vrfy.org>
-Tested-by: Kay Sievers <kay.sievers@vrfy.org>
-Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
----
- fs/block_dev.c |   27 ++++++++++++++++++---------
- 1 file changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index d4d19ac..50797bf 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -1220,6 +1220,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 			if (!bdev->bd_part)
- 				goto out_clear;
- 
-+			ret = 0;
- 			if (disk->fops->open) {
- 				ret = disk->fops->open(bdev, mode);
- 				if (ret == -ERESTARTSYS) {
-@@ -1235,9 +1236,18 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 					mutex_unlock(&bdev->bd_mutex);
- 					goto restart;
- 				}
--				if (ret)
--					goto out_clear;
- 			}
-+			/*
-+			 * If the device is invalidated, rescan partition
-+			 * if open succeeded or failed with -ENOMEDIUM.
-+			 * The latter is necessary to prevent ghost
-+			 * partitions on a removed medium.
-+			 */
-+			if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM))
-+				rescan_partitions(disk, bdev);
-+			if (ret)
-+				goto out_clear;
-+
- 			if (!bdev->bd_openers) {
- 				bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
- 				bdi = blk_get_backing_dev_info(bdev);
-@@ -1245,8 +1255,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 					bdi = &default_backing_dev_info;
- 				bdev->bd_inode->i_data.backing_dev_info = bdi;
- 			}
--			if (bdev->bd_invalidated)
--				rescan_partitions(disk, bdev);
- 		} else {
- 			struct block_device *whole;
- 			whole = bdget_disk(disk, 0);
-@@ -1273,13 +1281,14 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 		put_disk(disk);
- 		disk = NULL;
- 		if (bdev->bd_contains == bdev) {
--			if (bdev->bd_disk->fops->open) {
-+			ret = 0;
-+			if (bdev->bd_disk->fops->open)
- 				ret = bdev->bd_disk->fops->open(bdev, mode);
--				if (ret)
--					goto out_unlock_bdev;
--			}
--			if (bdev->bd_invalidated)
-+			/* the same as first opener case, read comment there */
-+			if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM))
- 				rescan_partitions(bdev->bd_disk, bdev);
-+			if (ret)
-+				goto out_unlock_bdev;
- 		}
- 	}
- 	bdev->bd_openers++;
--- 
-1.7.9.3
-
diff --git a/queue/series b/queue/series
index be3c503..4f7139e 100644
--- a/queue/series
+++ b/queue/series
@@ -4,7 +4,6 @@ CPU-hotplug-re-create-sysfs-directory-and-symlinks.patch
 Fix-memory-leak-in-cpufreq_stat.patch
 powerpc-kexec-Fix-memory-corruption-from-unallocated.patch
 powerpc-oprofile-Handle-events-that-raise-an-excepti.patch
-block-rescan-partitions-on-invalidated-devices-on-EN.patch
 block-add-proper-state-guards-to-__elv_next_request.patch
 mtd-mtdconcat-fix-NAND-OOB-write.patch
 x86-64-bit-Fix-copy_-to-from-_user-checks-for-the-us.patch