X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkernel.git;a=blobdiff_plain;f=kernel-small_fixes.patch;h=0eb6a2159c1d76a659378995be1b5779c48bcfa7;hp=ebdc93f473a065ec85d2d6100eb28933bc3c7828;hb=e855175e3f7da27aeb63c8fb6b9c3c0e0126d33d;hpb=eea7c745e0dc334eee3ef26329b62f99bcc1e306

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index ebdc93f4..0eb6a215 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -1,51 +1,171 @@
---- linux-2.6.33/scripts/mod/modpost.c~	2010-02-24 19:52:17.000000000 +0100
-+++ linux-2.6.33/scripts/mod/modpost.c	2010-03-07 14:26:47.242168558 +0100
-@@ -15,7 +15,8 @@
- #include <stdio.h>
- #include <ctype.h>
- #include "modpost.h"
--#include "../../include/generated/autoconf.h"
-+// PLD architectures don't use CONFIG_SYMBOL_PREFIX
-+//#include "../../include/generated/autoconf.h"
- #include "../../include/linux/license.h"
+--- linux-5.1/net/sunrpc/Kconfig~	2019-05-06 02:42:58.000000000 +0200
++++ linux-5.1/net/sunrpc/Kconfig	2019-05-10 12:54:36.566903892 +0200
+@@ -34,7 +34,7 @@ config RPCSEC_GSS_KRB5
  
- /* Some toolchains use a `_' prefix for all user symbols. */
-
---- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~	2011-07-22 04:17:23.000000000 +0200
-+++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh	2011-08-25 21:26:04.799150642 +0200
-@@ -9,6 +9,12 @@
- 			$cc -print-file-name=lib${lib}.${ext} | grep -q /
- 			if [ $? -eq 0 ]; then
- 				echo "-l${lib}"
-+				for libt in tinfow tinfo ; do
-+					$cc -print-file-name=lib${libt}.${ext} | grep -q /
-+					if [ $? -eq 0 ]; then
-+						echo "-l${libt}"
-+					fi
-+				done
- 				exit
- 			fi
- 		done
-
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -4103,6 +4103,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
- 	/* Get MAC address */
- 	for (i = 0; i < ETH_ALEN; i++)
- 		dev->dev_addr[i] = RTL_R8(MAC0 + i);
-+
-+	if (!is_valid_ether_addr(dev->dev_addr)) {
-+		/* Report it and use a random ethernet address instead */
-+		netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+		random_ether_addr(dev->dev_addr);
-+		netdev_info(dev, "Using random MAC address: %pM\n",
-+			    dev->dev_addr);
-+	}
- 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+ 	  If unsure, say Y.
  
- 	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
--- 
-1.7.7.3
-
+-config CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES
++config SUNRPC_DISABLE_INSECURE_ENCTYPES
+ 	bool "Secure RPC: Disable insecure Kerberos encryption types"
+ 	depends on RPCSEC_GSS_KRB5
+ 	default n
+Move setting up operation and write hint to xfs_alloc_ioend, and
+then just copy over all needed information from the previous bio
+in xfs_chain_bio and stop passing various parameters to it.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+---
+ fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------
+ 1 file changed, 17 insertions(+), 18 deletions(-)
+
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index a6f0f4761a37..9cceb90e77c5 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -665,7 +665,6 @@ xfs_submit_ioend(
+ 
+ 	ioend->io_bio->bi_private = ioend;
+ 	ioend->io_bio->bi_end_io = xfs_end_bio;
+-	ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
+ 
+ 	/*
+ 	 * If we are failing the IO now, just mark the ioend with an
+@@ -679,7 +678,6 @@ xfs_submit_ioend(
+ 		return status;
+ 	}
+ 
+-	ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
+ 	submit_bio(ioend->io_bio);
+ 	return 0;
+ }
+@@ -691,7 +689,8 @@ xfs_alloc_ioend(
+ 	xfs_exntst_t		state,
+ 	xfs_off_t		offset,
+ 	struct block_device	*bdev,
+-	sector_t		sector)
++	sector_t		sector,
++	struct writeback_control *wbc)
+ {
+ 	struct xfs_ioend	*ioend;
+ 	struct bio		*bio;
+@@ -699,6 +698,8 @@ xfs_alloc_ioend(
+ 	bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
+ 	bio_set_dev(bio, bdev);
+ 	bio->bi_iter.bi_sector = sector;
++	bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
++	bio->bi_write_hint = inode->i_write_hint;
+ 
+ 	ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
+ 	INIT_LIST_HEAD(&ioend->io_list);
+@@ -719,24 +720,22 @@ xfs_alloc_ioend(
+  * so that the bi_private linkage is set up in the right direction for the
+  * traversal in xfs_destroy_ioend().
+  */
+-static void
++static struct bio *
+ xfs_chain_bio(
+-	struct xfs_ioend	*ioend,
+-	struct writeback_control *wbc,
+-	struct block_device	*bdev,
+-	sector_t		sector)
++	struct bio		*prev)
+ {
+ 	struct bio *new;
+ 
+ 	new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
+-	bio_set_dev(new, bdev);
+-	new->bi_iter.bi_sector = sector;
+-	bio_chain(ioend->io_bio, new);
+-	bio_get(ioend->io_bio);		/* for xfs_destroy_ioend */
+-	ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
+-	ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
+-	submit_bio(ioend->io_bio);
+-	ioend->io_bio = new;
++	bio_copy_dev(new, prev);
++	new->bi_iter.bi_sector = bio_end_sector(prev);
++	new->bi_opf = prev->bi_opf;
++	new->bi_write_hint = prev->bi_write_hint;
++
++	bio_chain(prev, new);
++	bio_get(prev);		/* for xfs_destroy_ioend */
++	submit_bio(prev);
++	return new;
+ }
+ 
+ /*
+@@ -771,14 +770,14 @@ xfs_add_to_ioend(
+ 		if (wpc->ioend)
+ 			list_add(&wpc->ioend->io_list, iolist);
+ 		wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
+-				wpc->imap.br_state, offset, bdev, sector);
++				wpc->imap.br_state, offset, bdev, sector, wbc);
+ 	}
+ 
+ 	if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) {
+ 		if (iop)
+ 			atomic_inc(&iop->write_count);
+ 		if (bio_full(wpc->ioend->io_bio))
+-			xfs_chain_bio(wpc->ioend, wbc, bdev, sector);
++			wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
+ 		bio_add_page(wpc->ioend->io_bio, page, len, poff);
+ 	}
+ 
+-- 
+2.20.1
+
+
+Link every newly allocated writeback bio to cgroup pointed to by the
+writeback control structure, and charge every byte written back to it.
+
+Tested-by: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+---
+ fs/xfs/xfs_aops.c  | 4 +++-
+ fs/xfs/xfs_super.c | 2 ++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
+index 9cceb90e77c5..73c291aeae17 100644
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -700,6 +700,7 @@ xfs_alloc_ioend(
+ 	bio->bi_iter.bi_sector = sector;
+ 	bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
+ 	bio->bi_write_hint = inode->i_write_hint;
++	wbc_init_bio(wbc, bio);
+ 
+ 	ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
+ 	INIT_LIST_HEAD(&ioend->io_list);
+@@ -727,7 +728,7 @@ xfs_chain_bio(
+ 	struct bio *new;
+ 
+ 	new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
+-	bio_copy_dev(new, prev);
++	bio_copy_dev(new, prev);/* also copies over blkcg information */
+ 	new->bi_iter.bi_sector = bio_end_sector(prev);
+ 	new->bi_opf = prev->bi_opf;
+ 	new->bi_write_hint = prev->bi_write_hint;
+@@ -782,6 +783,7 @@ xfs_add_to_ioend(
+ 	}
+ 
+ 	wpc->ioend->io_size += len;
++	wbc_account_io(wbc, page, len);
+ }
+ 
+ STATIC void
+diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
+index 594c119824cc..ee0df8f611ff 100644
+--- a/fs/xfs/xfs_super.c
++++ b/fs/xfs/xfs_super.c
+@@ -1685,6 +1685,8 @@ xfs_fs_fill_super(
+ 	sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
+ 	sb->s_max_links = XFS_MAXLINK;
+ 	sb->s_time_gran = 1;
++	sb->s_iflags |= SB_I_CGROUPWB;
++
+ 	set_posix_acl_flag(sb);
+ 
+ 	/* version 5 superblocks support inode version counters. */
+-- 
+2.20.1
+