[linux] 01/02: Remove unused patches

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Wed Aug 26 01:03:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie
in repository linux.

commit dc6bb42b368287dbce64448c9bb6c201cf0cb170
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Aug 12 22:01:31 2015 +0200

    Remove unused patches
---
 .../all/cdc_ncm-fix-tx_bytes-statistics.patch      | 37 ----------
 ...le-need_dma_map_state-by-default-when-swi.patch | 54 --------------
 ...ta-corruption-caused-by-unwritten-and-del.patch | 86 ----------------------
 ...ve-check-under-lock-scope-to-close-a-race.patch | 48 ------------
 ...cklist-queued-trim-on-samsung-ssd-850-pro.patch | 27 -------
 .../libata-update-crucial-micron-blacklist.patch   | 37 ----------
 ...-to-sector-variable-in-raid0_make_request.patch | 46 ------------
 ...ength-of-extended-attributes-and-allocati.patch | 41 -----------
 .../all/udf-remove-repeated-loads-blocksize.patch  | 83 ---------------------
 .../all/udp-fix-behavior-of-wrong-checksums.patch  | 58 ---------------
 ...rmada-xp-openblocks-ax3-4-disable-interna.patch | 32 --------
 debian/patches/debian/no-clean.patch               |  0
 12 files changed, 549 deletions(-)

diff --git a/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch b/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
deleted file mode 100644
index 0bf329a..0000000
--- a/debian/patches/bugfix/all/cdc_ncm-fix-tx_bytes-statistics.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn at mork.no>
-Date: Fri, 22 May 2015 13:15:22 +0200
-Subject: cdc_ncm: Fix tx_bytes statistics
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Origin: https://git.kernel.org/linus/44f6731d8b68fa02f5ed65eaceac41f8c3c9279e
-
-The tx_curr_frame_payload field is u32. When we try to calculate a
-small negative delta based on it, we end up with a positive integer
-close to 2^32 instead.  So the tx_bytes pointer increases by about
-2^32 for every transmitted frame.
-
-Fix by calculating the delta as a signed long.
-
-Cc: Ben Hutchings <ben.hutchings at codethink.co.uk>
-Reported-by: Florian Bruhin <me at the-compiler.org>
-Fixes: 7a1e890e2168 ("usbnet: Fix tx_bytes statistic running backward in cdc_ncm")
-Signed-off-by: Bjørn Mork <bjorn at mork.no>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- drivers/net/usb/cdc_ncm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
-index c3e4da9..8067b8f 100644
---- a/drivers/net/usb/cdc_ncm.c
-+++ b/drivers/net/usb/cdc_ncm.c
-@@ -1182,7 +1182,7 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
- 	 * payload data instead.
- 	 */
- 	usbnet_set_skb_tx_stats(skb_out, n,
--				ctx->tx_curr_frame_payload - skb_out->len);
-+				(long)ctx->tx_curr_frame_payload - skb_out->len);
- 
- 	return skb_out;
- 
diff --git a/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch b/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
deleted file mode 100644
index 7420ad8..0000000
--- a/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
-Date: Fri, 17 Apr 2015 15:04:48 -0400
-Subject: config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
-Origin: https://git.kernel.org/linus/a6dfa128ce5c414ab46b1d690f7a1b8decb8526d
-Bug-Debian: https://bugs.debian.org/786551
-
-A huge amount of NIC drivers use the DMA API, however if
-compiled under 32-bit an very important part of the DMA API can
-be ommitted leading to the drivers not working at all
-(especially if used with 'swiotlb=force iommu=soft').
-
-As Prashant Sreedharan explains it: "the driver [tg3] uses
-DEFINE_DMA_UNMAP_ADDR(), dma_unmap_addr_set() to keep a copy of
-the dma "mapping" and dma_unmap_addr() to get the "mapping"
-value. On most of the platforms this is a no-op, but ... with
-"iommu=soft and swiotlb=force" this house keeping is required,
-... otherwise we pass 0 while calling pci_unmap_/pci_dma_sync_
-instead of the DMA address."
-
-As such enable this even when using 32-bit kernels.
-
-Reported-by: Ian Jackson <Ian.Jackson at eu.citrix.com>
-Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
-Acked-by: David S. Miller <davem at davemloft.net>
-Acked-by: Prashant Sreedharan <prashant at broadcom.com>
-Cc: Borislav Petkov <bp at alien8.de>
-Cc: H. Peter Anvin <hpa at zytor.com>
-Cc: Linus Torvalds <torvalds at linux-foundation.org>
-Cc: Michael Chan <mchan at broadcom.com>
-Cc: Thomas Gleixner <tglx at linutronix.de>
-Cc: boris.ostrovsky at oracle.com
-Cc: cascardo at linux.vnet.ibm.com
-Cc: david.vrabel at citrix.com
-Cc: sanjeevb at broadcom.com
-Cc: siva.kallam at broadcom.com
-Cc: vyasevich at gmail.com
-Cc: xen-devel at lists.xensource.com
-Link: http://lkml.kernel.org/r/20150417190448.GA9462@l.oracle.com
-Signed-off-by: Ingo Molnar <mingo at kernel.org>
----
- arch/x86/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -164,7 +164,7 @@ config SBUS
- 
- config NEED_DMA_MAP_STATE
- 	def_bool y
--	depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG
-+	depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB
- 
- config NEED_SG_DMA_LENGTH
- 	def_bool y
diff --git a/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch b/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch
deleted file mode 100644
index 238ff8d..0000000
--- a/debian/patches/bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Lukas Czerner <lczerner at redhat.com>
-Date: Sat, 2 May 2015 21:36:55 -0400
-Subject: ext4: fix data corruption caused by unwritten and delayed extents
-Origin: https://git.kernel.org/linus/d2dc317d564a46dfc683978a2e5a4f91434e9711
-Bug-Debian: https://bugs.debian.org/785672
-
-Currently it is possible to lose whole file system block worth of data
-when we hit the specific interaction with unwritten and delayed extents
-in status extent tree.
-
-The problem is that when we insert delayed extent into extent status
-tree the only way to get rid of it is when we write out delayed buffer.
-However there is a limitation in the extent status tree implementation
-so that when inserting unwritten extent should there be even a single
-delayed block the whole unwritten extent would be marked as delayed.
-
-At this point, there is no way to get rid of the delayed extents,
-because there are no delayed buffers to write out. So when a we write
-into said unwritten extent we will convert it to written, but it still
-remains delayed.
-
-When we try to write into that block later ext4_da_map_blocks() will set
-the buffer new and delayed and map it to invalid block which causes
-the rest of the block to be zeroed loosing already written data.
-
-For now we can fix this by simply not allowing to set delayed status on
-written extent in the extent status tree. Also add WARN_ON() to make
-sure that we notice if this happens in the future.
-
-This problem can be easily reproduced by running the following xfs_io.
-
-xfs_io -f -c "pwrite -S 0xaa 4096 2048" \
-          -c "falloc 0 131072" \
-          -c "pwrite -S 0xbb 65536 2048" \
-          -c "fsync" /mnt/test/fff
-
-echo 3 > /proc/sys/vm/drop_caches
-xfs_io -c "pwrite -S 0xdd 67584 2048" /mnt/test/fff
-
-This can be theoretically also reproduced by at random by running fsx,
-but it's not very reliable, though on machines with bigger page size
-(like ppc) this can be seen more often (especially xfstest generic/127)
-
-Signed-off-by: Lukas Czerner <lczerner at redhat.com>
-Signed-off-by: Theodore Ts'o <tytso at mit.edu>
-Cc: stable at vger.kernel.org
----
- fs/ext4/extents_status.c | 8 ++++++++
- fs/ext4/inode.c          | 2 ++
- 2 files changed, 10 insertions(+)
-
---- a/fs/ext4/extents_status.c
-+++ b/fs/ext4/extents_status.c
-@@ -662,6 +662,14 @@ int ext4_es_insert_extent(struct inode *
- 
- 	BUG_ON(end < lblk);
- 
-+	if ((status & EXTENT_STATUS_DELAYED) &&
-+	    (status & EXTENT_STATUS_WRITTEN)) {
-+		ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
-+				" delayed and written which can potentially "
-+				" cause data loss.\n", lblk, len);
-+		WARN_ON(1);
-+	}
-+
- 	newes.es_lblk = lblk;
- 	newes.es_len = len;
- 	ext4_es_store_pblock_status(&newes, pblk, status);
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -577,6 +577,7 @@ int ext4_map_blocks(handle_t *handle, st
- 		status = map->m_flags & EXT4_MAP_UNWRITTEN ?
- 				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
- 		if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) &&
-+		    !(status & EXTENT_STATUS_WRITTEN) &&
- 		    ext4_find_delalloc_range(inode, map->m_lblk,
- 					     map->m_lblk + map->m_len - 1))
- 			status |= EXTENT_STATUS_DELAYED;
-@@ -691,6 +692,7 @@ found:
- 		status = map->m_flags & EXT4_MAP_UNWRITTEN ?
- 				EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
- 		if (!(flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE) &&
-+		    !(status & EXTENT_STATUS_WRITTEN) &&
- 		    ext4_find_delalloc_range(inode, map->m_lblk,
- 					     map->m_lblk + map->m_len - 1))
- 			status |= EXTENT_STATUS_DELAYED;
diff --git a/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch b/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch
deleted file mode 100644
index 163f932..0000000
--- a/debian/patches/bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Davide Italiano <dccitaliano at gmail.com>
-Date: Sat, 2 May 2015 23:21:15 -0400
-Subject: ext4: move check under lock scope to close a race.
-Origin: https://git.kernel.org/linus/280227a75b56ab5d35854f3a77ef74a7ad56a203
-
-fallocate() checks that the file is extent-based and returns
-EOPNOTSUPP in case is not. Other tasks can convert from and to
-indirect and extent so it's safe to check only after grabbing
-the inode mutex.
-
-Signed-off-by: Davide Italiano <dccitaliano at gmail.com>
-Signed-off-by: Theodore Ts'o <tytso at mit.edu>
-Cc: stable at vger.kernel.org
----
- fs/ext4/extents.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
---- a/fs/ext4/extents.c
-+++ b/fs/ext4/extents.c
-@@ -4933,13 +4933,6 @@ long ext4_fallocate(struct file *file, i
- 	if (ret)
- 		return ret;
- 
--	/*
--	 * currently supporting (pre)allocate mode for extent-based
--	 * files _only_
--	 */
--	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))
--		return -EOPNOTSUPP;
--
- 	if (mode & FALLOC_FL_COLLAPSE_RANGE)
- 		return ext4_collapse_range(inode, offset, len);
- 
-@@ -4961,6 +4954,14 @@ long ext4_fallocate(struct file *file, i
- 
- 	mutex_lock(&inode->i_mutex);
- 
-+	/*
-+	 * We only support preallocation for extent-based files only
-+	 */
-+	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
-+		ret = -EOPNOTSUPP;
-+		goto out;
-+	}
-+
- 	if (!(mode & FALLOC_FL_KEEP_SIZE) &&
- 	     offset + len > i_size_read(inode)) {
- 		new_size = offset + len;
diff --git a/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch b/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
deleted file mode 100644
index b8dbeca..0000000
--- a/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: "Martin K. Petersen" <martin.petersen at oracle.com>
-Date: Fri, 27 Mar 2015 15:17:21 -0400
-Subject: libata: Blacklist queued TRIM on Samsung SSD 850 Pro
-Origin: https://git.kernel.org/linus/6fc4d97a4987c5d247655a157a9377996626221a
-
-Blacklist queued TRIM on this drive for now.
-
-Reported-by: Stefan Keller <linux-list at zahlenfresser.de>
-Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-CC: stable at vger.kernel.org
-Signed-off-by: Tejun Heo <tj at kernel.org>
-[bwh: Backported to 3.16: adjust context and drop ZERO_AFTER_TRIM flag]
-Signed-off-by; Ben Hutchings <ben at decadent.org.uk>
----
- drivers/ata/libata-core.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -4229,6 +4229,7 @@ static const struct ata_blacklist_entry
- 	{ "Micron_M5[15]0*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
- 	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
- 	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Samsung SSD 850 PRO*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
- 
- 	/*
- 	 * Some WD SATA-I drives spin up and down erratically when the link
diff --git a/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch b/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch
deleted file mode 100644
index 596a207..0000000
--- a/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: "Martin K. Petersen" <martin.petersen at oracle.com>
-Date: Fri, 27 Mar 2015 15:17:20 -0400
-Subject: libata: Update Crucial/Micron blacklist
-Origin: https://git.kernel.org/linus/ff7f53fb82a7801a778e5902bdbbc5e195ab0de0
-
-Micron has released an updated firmware (MU02) for M510/M550/MX100
-drives to fix the issues with queued TRIM. Queued TRIM remains broken on
-M500 but is working fine on later drives such as M600 and MX200.
-
-Tweak our blacklist to reflect the above.
-
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=71371
-Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
-Cc: stable at vger.kernel.org
-Signed-off-by: Tejun Heo <tj at kernel.org>
-[bwh: Backported to 3.16: adjust context and drop ZERO_AFTER_TRIM flags]
-Signed-off-by; Ben Hutchings <ben at decadent.org.uk>
----
- drivers/ata/libata-core.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -4225,9 +4225,10 @@ static const struct ata_blacklist_entry
- 
- 	/* devices that don't properly handle queued TRIM commands */
- 	{ "Micron_M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
--	{ "Crucial_CT???M500SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
--	{ "Micron_M550*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
--	{ "Crucial_CT*M550SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Crucial_CT*M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Micron_M5[15]0*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
-+	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
- 
- 	/*
- 	 * Some WD SATA-I drives spin up and down erratically when the link
diff --git a/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch b/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch
deleted file mode 100644
index 9269752..0000000
--- a/debian/patches/bugfix/all/md-raid0-fix-restore-to-sector-variable-in-raid0_make_request.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Eric Work <work.eric at gmail.com>
-Date: Mon, 18 May 2015 23:26:23 -0700
-Subject: md/raid0: fix restore to sector variable in raid0_make_request
-Origin: http://git.neil.brown.name/?p=md.git;a=commitdiff;h=a81157768a00e8cf8a7b43b5ea5cac931262374f
-Bug: https://bugzilla.kernel.org/show_bug.cgi?id=98501
-Bug-Debian: https://bugs.debian.org/786372
-
-The variable "sector" in "raid0_make_request()" was improperly updated
-by a call to "sector_div()" which modifies its first argument in place.
-Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
-after the call for later re-use.  Unfortunetly the restore was done after
-the referenced variable "bio" was advanced.  This lead to the original
-value and the restored value being different.  Here we move this line to
-the proper place.
-
-One observed side effect of this bug was discarding a file though
-unlinking would cause an unrelated file's contents to be discarded.
-
-Signed-off-by: NeilBrown <neilb at suse.de>
-Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
-Cc: stable at vger.kernel.org (any that received above backport)
-URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
----
- drivers/md/raid0.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/md/raid0.c
-+++ b/drivers/md/raid0.c
-@@ -531,6 +531,9 @@ static void raid0_make_request(struct md
- 			 ? (sector & (chunk_sects-1))
- 			 : sector_div(sector, chunk_sects));
- 
-+		/* Restore due to sector_div */
-+		sector = bio->bi_iter.bi_sector;
-+
- 		if (sectors < bio_sectors(bio)) {
- 			split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
- 			bio_chain(split, bio);
-@@ -538,7 +541,6 @@ static void raid0_make_request(struct md
- 			split = bio;
- 		}
- 
--		sector = bio->bi_iter.bi_sector;
- 		zone = find_zone(mddev->private, &sector);
- 		tmp_dev = map_sector(mddev, zone, sector, &sector);
- 		split->bi_bdev = tmp_dev->bdev;
diff --git a/debian/patches/bugfix/all/udf-check-length-of-extended-attributes-and-allocati.patch b/debian/patches/bugfix/all/udf-check-length-of-extended-attributes-and-allocati.patch
deleted file mode 100644
index 066e08c..0000000
--- a/debian/patches/bugfix/all/udf-check-length-of-extended-attributes-and-allocati.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Jan Kara <jack at suse.cz>
-Date: Wed, 7 Jan 2015 13:49:08 +0100
-Subject: udf: Check length of extended attributes and allocation descriptors
-Origin: https://git.kernel.org/linus/925cab7b6a683f791644dfde345f91e87017a023
-
-commit 23b133bdc452aa441fcb9b82cbf6dd05cfd342d0 upstream.
-
-Check length of extended attributes and allocation descriptors when
-loading inodes from disk. Otherwise corrupted filesystems could confuse
-the code and make the kernel oops.
-
-Reported-by: Carl Henrik Lunde <chlunde at ping.uio.no>
-Signed-off-by: Jan Kara <jack at suse.cz>
-[bwh: Backported to 3.16: use make_bad_inode() instead of returning error]
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
- fs/udf/inode.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/fs/udf/inode.c
-+++ b/fs/udf/inode.c
-@@ -1494,6 +1494,19 @@ static void udf_fill_inode(struct inode
- 		iinfo->i_checkpoint = le32_to_cpu(efe->checkpoint);
- 	}
- 
-+	/*
-+	 * Sanity check length of allocation descriptors and extended attrs to
-+	 * avoid integer overflows
-+	 */
-+	if (iinfo->i_lenEAttr > bs || iinfo->i_lenAlloc > bs) {
-+		make_bad_inode(inode);
-+		return;
-+	}
-+	/* Now do exact checks */
-+	if (udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc > bs) {
-+		make_bad_inode(inode);
-+		return;
-+	}
- 	/* Sanity checks for files in ICB so that we don't get confused later */
- 	if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
- 		/*
diff --git a/debian/patches/bugfix/all/udf-remove-repeated-loads-blocksize.patch b/debian/patches/bugfix/all/udf-remove-repeated-loads-blocksize.patch
deleted file mode 100644
index bce6009..0000000
--- a/debian/patches/bugfix/all/udf-remove-repeated-loads-blocksize.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Jan Kara <jack at suse.cz>
-Date: Wed, 7 Jan 2015 13:46:16 +0100
-Subject: udf: Remove repeated loads blocksize
-Origin: https://git.kernel.org/linus/79144954278d4bb5989f8b903adcac7a20ff2a5a
-
-Store blocksize in a local variable in udf_fill_inode() since it is used
-a lot of times.
-
-Signed-off-by: Jan Kara <jack at suse.cz>
-[bwh: Needed for the following fix. Backported to 3.16: adjust context.]
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
- fs/udf/inode.c | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
---- a/fs/udf/inode.c
-+++ b/fs/udf/inode.c
-@@ -1365,6 +1365,7 @@ static void udf_fill_inode(struct inode
- 	struct udf_sb_info *sbi = UDF_SB(inode->i_sb);
- 	struct udf_inode_info *iinfo = UDF_I(inode);
- 	unsigned int link_count;
-+	int bs = inode->i_sb->s_blocksize;
- 
- 	fe = (struct fileEntry *)bh->b_data;
- 	efe = (struct extendedFileEntry *)bh->b_data;
-@@ -1385,41 +1386,38 @@ static void udf_fill_inode(struct inode
- 	if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_EFE)) {
- 		iinfo->i_efe = 1;
- 		iinfo->i_use = 0;
--		if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-+		if (udf_alloc_i_data(inode, bs -
- 					sizeof(struct extendedFileEntry))) {
- 			make_bad_inode(inode);
- 			return;
- 		}
- 		memcpy(iinfo->i_ext.i_data,
- 		       bh->b_data + sizeof(struct extendedFileEntry),
--		       inode->i_sb->s_blocksize -
--					sizeof(struct extendedFileEntry));
-+		       bs - sizeof(struct extendedFileEntry));
- 	} else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_FE)) {
- 		iinfo->i_efe = 0;
- 		iinfo->i_use = 0;
--		if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
--						sizeof(struct fileEntry))) {
-+		if (udf_alloc_i_data(inode, bs - sizeof(struct fileEntry))) {
- 			make_bad_inode(inode);
- 			return;
- 		}
- 		memcpy(iinfo->i_ext.i_data,
- 		       bh->b_data + sizeof(struct fileEntry),
--		       inode->i_sb->s_blocksize - sizeof(struct fileEntry));
-+		       bs - sizeof(struct fileEntry));
- 	} else if (fe->descTag.tagIdent == cpu_to_le16(TAG_IDENT_USE)) {
- 		iinfo->i_efe = 0;
- 		iinfo->i_use = 1;
- 		iinfo->i_lenAlloc = le32_to_cpu(
- 				((struct unallocSpaceEntry *)bh->b_data)->
- 				 lengthAllocDescs);
--		if (udf_alloc_i_data(inode, inode->i_sb->s_blocksize -
-+		if (udf_alloc_i_data(inode, bs -
- 					sizeof(struct unallocSpaceEntry))) {
- 			make_bad_inode(inode);
- 			return;
- 		}
- 		memcpy(iinfo->i_ext.i_data,
- 		       bh->b_data + sizeof(struct unallocSpaceEntry),
--		       inode->i_sb->s_blocksize -
--					sizeof(struct unallocSpaceEntry));
-+		       bs - sizeof(struct unallocSpaceEntry));
- 		return;
- 	}
- 
-@@ -1507,8 +1505,7 @@ static void udf_fill_inode(struct inode
- 			return;
- 		}
- 		/* File in ICB has to fit in there... */
--		if (inode->i_size > inode->i_sb->s_blocksize -
--					udf_file_entry_alloc_offset(inode)) {
-+		if (inode->i_size > bs - udf_file_entry_alloc_offset(inode)) {
- 			make_bad_inode(inode);
- 			return;
- 		}
diff --git a/debian/patches/bugfix/all/udp-fix-behavior-of-wrong-checksums.patch b/debian/patches/bugfix/all/udp-fix-behavior-of-wrong-checksums.patch
deleted file mode 100644
index 4ba4811..0000000
--- a/debian/patches/bugfix/all/udp-fix-behavior-of-wrong-checksums.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Eric Dumazet <edumazet at google.com>
-Date: Sat, 30 May 2015 09:16:53 -0700
-Subject: udp: fix behavior of wrong checksums
-Origin: https://git.kernel.org/linus/beb39db59d14990e401e235faf66a6b9b31240b0
-
-We have two problems in UDP stack related to bogus checksums :
-
-1) We return -EAGAIN to application even if receive queue is not empty.
-   This breaks applications using edge trigger epoll()
-
-2) Under UDP flood, we can loop forever without yielding to other
-   processes, potentially hanging the host, especially on non SMP.
-
-This patch is an attempt to make things better.
-
-We might in the future add extra support for rt applications
-wanting to better control time spent doing a recv() in a hostile
-environment. For example we could validate checksums before queuing
-packets in socket receive queue.
-
-Signed-off-by: Eric Dumazet <edumazet at google.com>
-Cc: Willem de Bruijn <willemb at google.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
- net/ipv4/udp.c | 6 ++----
- net/ipv6/udp.c | 6 ++----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
---- a/net/ipv4/udp.c
-+++ b/net/ipv4/udp.c
-@@ -1356,10 +1356,8 @@ csum_copy_err:
- 	}
- 	unlock_sock_fast(sk, slow);
- 
--	if (noblock)
--		return -EAGAIN;
--
--	/* starting over for a new packet */
-+	/* starting over for a new packet, but check if we need to yield */
-+	cond_resched();
- 	msg->msg_flags &= ~MSG_TRUNC;
- 	goto try_again;
- }
---- a/net/ipv6/udp.c
-+++ b/net/ipv6/udp.c
-@@ -515,10 +515,8 @@ csum_copy_err:
- 	}
- 	unlock_sock_fast(sk, slow);
- 
--	if (noblock)
--		return -EAGAIN;
--
--	/* starting over for a new packet */
-+	/* starting over for a new packet, but check if we need to yield */
-+	cond_resched();
- 	msg->msg_flags &= ~MSG_TRUNC;
- 	goto try_again;
- }
diff --git a/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch b/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
deleted file mode 100644
index f24299c..0000000
--- a/debian/patches/bugfix/arm/arm-mvebu-armada-xp-openblocks-ax3-4-disable-interna.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Gregory CLEMENT <gregory.clement at free-electrons.com>
-Date: Tue, 14 Apr 2015 11:50:13 +0200
-Subject: ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
-Origin: https://git.kernel.org/linus/750e30d4076ae5e02ad13a376e96c95a2627742c
-Bug-Debian: https://bugs.debian.org/784146
-
-There is no crystal connected to the internal RTC on the Open Block
-AX3. So let's disable it in order to prevent the kernel probing the
-driver uselessly. Eventually this patches removes the following
-warning message from the boot log:
-"rtc-mv d0010300.rtc: internal RTC not ticking"
-
-Acked-by: Andrew Lunn <andrew at lunn.ch>
-Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
-Cc: <stable at vger.kernel.org> # v3.8 +
----
- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-@@ -71,6 +71,10 @@
- 		};
- 
- 		internal-regs {
-+			rtc at 10300 {
-+				/* No crystal connected to the internal RTC */
-+				status = "disabled";
-+			};
- 			serial at 12000 {
- 				status = "okay";
- 			};
diff --git a/debian/patches/debian/no-clean.patch b/debian/patches/debian/no-clean.patch
deleted file mode 100644
index e69de29..0000000

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git



More information about the Kernel-svn-changes mailing list