X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel-small_fixes.patch;h=2674f5c5fb8db3fc4dc47f5652758fdc3e85f684;hb=01e48efcc30d72b32989af1c8347c48af4ec8e54;hp=96e859b48e867040f86d84c637283be6433bc517;hpb=c43437952f98d8d1ff092721fe3d5a0ee268ed78;p=packages%2Fkernel.git diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 96e859b4..2674f5c5 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -1,156 +1,160 @@ ---- 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 - #include - #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 - -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 -@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const - 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); -+ } -+ - SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); - dev->watchdog_timeo = RTL8169_TX_TIMEOUT; - -[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set - -If a device has the skip_vpd_pages flag set we should simply fail the -scsi_get_vpd_page() call. - -Signed-off-by: Martin K. Petersen -Acked-by: Alan Stern -Tested-by: Stuart Foster -Cc: stable@vger.kernel.org - -diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c -index 3b1ea34..eaa808e 100644 ---- a/drivers/scsi/scsi.c -+++ b/drivers/scsi/scsi.c -@@ -1031,6 +1031,9 @@ - { - int i, result; - -+ if (sdev->skip_vpd_pages) -+ goto fail; -+ - /* Ask for all the pages supported by this device */ - result = scsi_vpd_inquiry(sdev, buf, 0, buf_len); - if (result) - -From 1e2ee49f7f1b79f0b14884fe6a602f0411b39552 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Tue, 6 May 2014 12:50:10 -0700 -Subject: fanotify: fix -EOVERFLOW with large files on 64-bit - -On 64-bit systems, O_LARGEFILE is automatically added to flags inside -the open() syscall (also openat(), blkdev_open(), etc). Userspace -therefore defines O_LARGEFILE to be 0 - you can use it, but it's a -no-op. Everything should be O_LARGEFILE by default. - -But: when fanotify does create_fd() it uses dentry_open(), which skips -all that. And userspace can't set O_LARGEFILE in fanotify_init() -because it's defined to 0. So if fanotify gets an event regarding a -large file, the read() will just fail with -EOVERFLOW. - -This patch adds O_LARGEFILE to fanotify_init()'s event_f_flags on 64-bit -systems, using the same test as open()/openat()/etc. - -Addresses https://bugzilla.redhat.com/show_bug.cgi?id=696821 - -Signed-off-by: Will Woods -Acked-by: Eric Paris -Reviewed-by: Jan Kara -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds - -diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c -index 4e565c8..732648b 100644 ---- a/fs/notify/fanotify/fanotify_user.c -+++ b/fs/notify/fanotify/fanotify_user.c -@@ -698,6 +698,8 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags) - } - group->overflow_event = &oevent->fse; - -+ if (force_o_largefile()) -+ event_f_flags |= O_LARGEFILE; - group->fanotify_data.f_flags = event_f_flags; - #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS - spin_lock_init(&group->fanotify_data.access_lock); --- -cgit v0.10.1 - -From 50c6e282bdf5e8dabf8d7cf7b162545a55645fd9 Mon Sep 17 00:00:00 2001 -From: Christoph Hellwig -Date: Sun, 4 May 2014 13:03:32 +0200 -Subject: posix_acl: handle NULL ACL in posix_acl_equiv_mode - -Various filesystems don't bother checking for a NULL ACL in -posix_acl_equiv_mode, and thus can dereference a NULL pointer when it -gets passed one. This usually happens from the NFS server, as the ACL tools -never pass a NULL ACL, but instead of one representing the mode bits. - -Instead of adding boilerplat to all filesystems put this check into one place, -which will allow us to remove the check from other filesystems as well later -on. - -Signed-off-by: Christoph Hellwig -Reported-by: Ben Greear -Reported-by: Marco Munderloh , -Cc: Chuck Lever -Cc: stable@vger.kernel.org -Signed-off-by: Al Viro - -diff --git a/fs/posix_acl.c b/fs/posix_acl.c -index 9e363e4..0855f77 100644 ---- a/fs/posix_acl.c -+++ b/fs/posix_acl.c -@@ -246,6 +246,12 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p) - umode_t mode = 0; - int not_equiv = 0; - -+ /* -+ * A null ACL can always be presented as mode bits. -+ */ -+ if (!acl) -+ return 0; -+ - FOREACH_ACL_ENTRY(pa, acl, pe) { - switch (pa->e_tag) { - case ACL_USER_OBJ: --- -cgit v0.10.1 - +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 +--- + 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; + } + + /* +@@ -614,14 +614,14 @@ xfs_add_to_ioend( + if (wpc->ioend) + list_add(&wpc->ioend->io_list, iolist); + wpc->ioend = xfs_alloc_ioend(inode, wpc->io_type, offset, +- bdev, sector); ++ bdev, sector, wbc); + } + + if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff)) { + 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 +Signed-off-by: Christoph Hellwig +--- + 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 +