---- 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"
-
- /* 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
-From 29183a70b0b828500816bd794b3fe192fce89f73 Mon Sep 17 00:00:00 2001
-From: John Stultz <john.stultz@linaro.org>
-Date: Mon, 9 Feb 2015 23:30:36 -0800
-Subject: ntp: Fixup adjtimex freq validation on 32-bit systems
-
-Additional validation of adjtimex freq values to avoid
-potential multiplication overflows were added in commit
-5e5aeb4367b (time: adjtimex: Validate the ADJ_FREQUENCY values)
-
-Unfortunately the patch used LONG_MAX/MIN instead of
-LLONG_MAX/MIN, which was fine on 64-bit systems, but being
-much smaller on 32-bit systems caused false positives
-resulting in most direct frequency adjustments to fail w/
-EINVAL.
-
-ntpd only does direct frequency adjustments at startup, so
-the issue was not as easily observed there, but other time
-sync applications like ptpd and chrony were more effected by
-the bug.
-
-See bugs:
-
- https://bugzilla.kernel.org/show_bug.cgi?id=92481
- https://bugzilla.redhat.com/show_bug.cgi?id=1188074
-
-This patch changes the checks to use LLONG_MAX for
-clarity, and additionally the checks are disabled
-on 32-bit systems since LLONG_MAX/PPM_SCALE is always
-larger then the 32-bit long freq value, so multiplication
-overflows aren't possible there.
-
-Reported-by: Josh Boyer <jwboyer@fedoraproject.org>
-Reported-by: George Joseph <george.joseph@fairview5.com>
-Tested-by: George Joseph <george.joseph@fairview5.com>
-Signed-off-by: John Stultz <john.stultz@linaro.org>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: <stable@vger.kernel.org> # v3.19+
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Sasha Levin <sasha.levin@oracle.com>
-Link: http://lkml.kernel.org/r/1423553436-29747-1-git-send-email-john.stultz@linaro.org
-[ Prettified the changelog and the comments a bit. ]
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-
-diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
-index 4b585e0..0f60b08 100644
---- a/kernel/time/ntp.c
-+++ b/kernel/time/ntp.c
-@@ -633,10 +633,14 @@ int ntp_validate_timex(struct timex *txc)
- if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME)))
- return -EPERM;
-
-- if (txc->modes & ADJ_FREQUENCY) {
-- if (LONG_MIN / PPM_SCALE > txc->freq)
-+ /*
-+ * Check for potential multiplication overflows that can
-+ * only happen on 64-bit systems:
-+ */
-+ if ((txc->modes & ADJ_FREQUENCY) && (BITS_PER_LONG == 64)) {
-+ if (LLONG_MIN / PPM_SCALE > txc->freq)
- return -EINVAL;
-- if (LONG_MAX / PPM_SCALE < txc->freq)
-+ if (LLONG_MAX / PPM_SCALE < txc->freq)
- return -EINVAL;
- }
-
---
-cgit v0.10.2
-
+Move setting up operation and write hint to xfs_alloc_ioend, and\r
+then just copy over all needed information from the previous bio\r
+in xfs_chain_bio and stop passing various parameters to it.\r
+\r
+Signed-off-by: Christoph Hellwig <hch@lst.de>\r
+---\r
+ fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------\r
+ 1 file changed, 17 insertions(+), 18 deletions(-)\r
+\r
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c\r
+index a6f0f4761a37..9cceb90e77c5 100644\r
+--- a/fs/xfs/xfs_aops.c\r
++++ b/fs/xfs/xfs_aops.c\r
+@@ -665,7 +665,6 @@ xfs_submit_ioend(\r
+ \r
+ ioend->io_bio->bi_private = ioend;\r
+ ioend->io_bio->bi_end_io = xfs_end_bio;\r
+- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
+ \r
+ /*\r
+ * If we are failing the IO now, just mark the ioend with an\r
+@@ -679,7 +678,6 @@ xfs_submit_ioend(\r
+ return status;\r
+ }\r
+ \r
+- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;\r
+ submit_bio(ioend->io_bio);\r
+ return 0;\r
+ }\r
+@@ -691,7 +689,8 @@ xfs_alloc_ioend(\r
+ xfs_exntst_t state,\r
+ xfs_off_t offset,\r
+ struct block_device *bdev,\r
+- sector_t sector)\r
++ sector_t sector,\r
++ struct writeback_control *wbc)\r
+ {\r
+ struct xfs_ioend *ioend;\r
+ struct bio *bio;\r
+@@ -699,6 +698,8 @@ xfs_alloc_ioend(\r
+ bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);\r
+ bio_set_dev(bio, bdev);\r
+ bio->bi_iter.bi_sector = sector;\r
++ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
++ bio->bi_write_hint = inode->i_write_hint;\r
+ \r
+ ioend = container_of(bio, struct xfs_ioend, io_inline_bio);\r
+ INIT_LIST_HEAD(&ioend->io_list);\r
+@@ -719,24 +720,22 @@ xfs_alloc_ioend(\r
+ * so that the bi_private linkage is set up in the right direction for the\r
+ * traversal in xfs_destroy_ioend().\r
+ */\r
+-static void\r
++static struct bio *\r
+ xfs_chain_bio(\r
+- struct xfs_ioend *ioend,\r
+- struct writeback_control *wbc,\r
+- struct block_device *bdev,\r
+- sector_t sector)\r
++ struct bio *prev)\r
+ {\r
+ struct bio *new;\r
+ \r
+ new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);\r
+- bio_set_dev(new, bdev);\r
+- new->bi_iter.bi_sector = sector;\r
+- bio_chain(ioend->io_bio, new);\r
+- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */\r
+- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
+- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;\r
+- submit_bio(ioend->io_bio);\r
+- ioend->io_bio = new;\r
++ bio_copy_dev(new, prev);\r
++ new->bi_iter.bi_sector = bio_end_sector(prev);\r
++ new->bi_opf = prev->bi_opf;\r
++ new->bi_write_hint = prev->bi_write_hint;\r
++\r
++ bio_chain(prev, new);\r
++ bio_get(prev); /* for xfs_destroy_ioend */\r
++ submit_bio(prev);\r
++ return new;\r
+ }\r
+ \r
+ /*\r
+@@ -614,14 +614,14 @@ xfs_add_to_ioend(\r
+ if (wpc->ioend)\r
+ list_add(&wpc->ioend->io_list, iolist);\r
+ wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset,\r
+- bdev, sector);\r
++ bdev, sector, wbc);\r
+ }\r
+ \r
+ if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff)) {\r
+ if (iop)\r
+ atomic_inc(&iop->write_count);\r
+ if (bio_full(wpc->ioend->io_bio))\r
+- xfs_chain_bio(wpc->ioend, wbc, bdev, sector);\r
++ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);\r
+ __bio_add_page(wpc->ioend->io_bio, page, len, poff);\r
+ }\r
+ \r
+-- \r
+2.20.1\r
+\r
+\r
+Link every newly allocated writeback bio to cgroup pointed to by the\r
+writeback control structure, and charge every byte written back to it.\r
+\r
+Tested-by: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>\r
+Signed-off-by: Christoph Hellwig <hch@lst.de>\r
+---\r
+ fs/xfs/xfs_aops.c | 4 +++-\r
+ fs/xfs/xfs_super.c | 2 ++\r
+ 2 files changed, 5 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c\r
+index 9cceb90e77c5..73c291aeae17 100644\r
+--- a/fs/xfs/xfs_aops.c\r
++++ b/fs/xfs/xfs_aops.c\r
+@@ -700,6 +700,7 @@ xfs_alloc_ioend(\r
+ bio->bi_iter.bi_sector = sector;\r
+ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
+ bio->bi_write_hint = inode->i_write_hint;\r
++ wbc_init_bio(wbc, bio);\r
+ \r
+ ioend = container_of(bio, struct xfs_ioend, io_inline_bio);\r
+ INIT_LIST_HEAD(&ioend->io_list);\r
+@@ -727,7 +728,7 @@ xfs_chain_bio(\r
+ struct bio *new;\r
+ \r
+ new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);\r
+- bio_copy_dev(new, prev);\r
++ bio_copy_dev(new, prev);/* also copies over blkcg information */\r
+ new->bi_iter.bi_sector = bio_end_sector(prev);\r
+ new->bi_opf = prev->bi_opf;\r
+ new->bi_write_hint = prev->bi_write_hint;\r
+@@ -782,6 +783,7 @@ xfs_add_to_ioend(\r
+ }\r
+ \r
+ wpc->ioend->io_size += len;\r
++ wbc_account_io(wbc, page, len);\r
+ }\r
+ \r
+ STATIC void\r
+diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c\r
+index 594c119824cc..ee0df8f611ff 100644\r
+--- a/fs/xfs/xfs_super.c\r
++++ b/fs/xfs/xfs_super.c\r
+@@ -1685,6 +1685,8 @@ xfs_fs_fill_super(\r
+ sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);\r
+ sb->s_max_links = XFS_MAXLINK;\r
+ sb->s_time_gran = 1;\r
++ sb->s_iflags |= SB_I_CGROUPWB;\r
++\r
+ set_posix_acl_flag(sb);\r
+ \r
+ /* version 5 superblocks support inode version counters. */\r
+-- \r
+2.20.1\r
+\r