Merge "Merge android-4.14.55 (2e9aed1) into msm-4.14" (de4318de) · Commits · e / devices / android_kernel_xiaomi_nabu

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 54
		SUBLEVEL = 55
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arm64/kernel/process.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ static void show_data(unsigned long addr, int nbytes, const char *name)
		for (j = 0; j < 8; j++) {
		u32 data;
		if (probe_kernel_address(p, data)) {
		printk(" ********");
		pr_cont(" ********");
		} else {
		pr_cont(" %08x", data);
		}

arch/s390/kernel/entry.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -1244,7 +1244,7 @@ cleanup_critical:
		jl 0f
		clg %r9,BASED(.Lcleanup_table+104) # .Lload_fpu_regs_end
		jl .Lcleanup_load_fpu_regs
		0: BR_EX %r14
		0: BR_EX %r14,%r11

		.align 8
		.Lcleanup_table:
		@@ -1280,7 +1280,7 @@ cleanup_critical:
		ni __SIE_PROG0C+3(%r9),0xfe # no longer in SIE
		lctlg %c1,%c1,__LC_USER_ASCE # load primary asce
		larl %r9,sie_exit # skip forward to sie_exit
		BR_EX %r14
		BR_EX %r14,%r11
		#endif

		.Lcleanup_system_call:

block/blk-lib.c

+72 −36

Original line number	Diff line number	Diff line
		@@ -275,6 +275,40 @@ static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects)
		return min(pages, (sector_t)BIO_MAX_PAGES);
		}

		static int __blkdev_issue_zero_pages(struct block_device *bdev,
		sector_t sector, sector_t nr_sects, gfp_t gfp_mask,
		struct bio **biop)
		{
		struct request_queue *q = bdev_get_queue(bdev);
		struct bio bio = biop;
		int bi_size = 0;
		unsigned int sz;

		if (!q)
		return -ENXIO;

		while (nr_sects != 0) {
		bio = next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),
		gfp_mask);
		bio->bi_iter.bi_sector = sector;
		bio_set_dev(bio, bdev);
		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

		while (nr_sects != 0) {
		sz = min((sector_t) PAGE_SIZE, nr_sects << 9);
		bi_size = bio_add_page(bio, ZERO_PAGE(0), sz, 0);
		nr_sects -= bi_size >> 9;
		sector += bi_size >> 9;
		if (bi_size < sz)
		break;
		}
		cond_resched();
		}

		*biop = bio;
		return 0;
		}

		/**
		* __blkdev_issue_zeroout - generate number of zero filed write bios
		* @bdev: blockdev to issue
		@@ -288,12 +322,6 @@ static unsigned int __blkdev_sectors_to_bio_pages(sector_t nr_sects)
		* Zero-fill a block range, either using hardware offload or by explicitly
		* writing zeroes to the device.
		*
		* Note that this function may fail with -EOPNOTSUPP if the driver signals
		* zeroing offload support, but the device fails to process the command (for
		* some devices there is no non-destructive way to verify whether this
		* operation is actually supported). In this case the caller should call
		* retry the call to blkdev_issue_zeroout() and the fallback path will be used.
		*
		* If a device is using logical block provisioning, the underlying space will
		* not be released if %flags contains BLKDEV_ZERO_NOUNMAP.
		*
		@@ -305,9 +333,6 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
		unsigned flags)
		{
		int ret;
		int bi_size = 0;
		struct bio bio = biop;
		unsigned int sz;
		sector_t bs_mask;

		bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
		@@ -317,30 +342,10 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
		ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask,
		biop, flags);
		if (ret != -EOPNOTSUPP \|\| (flags & BLKDEV_ZERO_NOFALLBACK))
		goto out;

		ret = 0;
		while (nr_sects != 0) {
		bio = next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),
		gfp_mask);
		bio->bi_iter.bi_sector = sector;
		bio_set_dev(bio, bdev);
		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

		while (nr_sects != 0) {
		sz = min((sector_t) PAGE_SIZE, nr_sects << 9);
		bi_size = bio_add_page(bio, ZERO_PAGE(0), sz, 0);
		nr_sects -= bi_size >> 9;
		sector += bi_size >> 9;
		if (bi_size < sz)
		break;
		}
		cond_resched();
		}

		*biop = bio;
		out:
		return ret;

		return __blkdev_issue_zero_pages(bdev, sector, nr_sects, gfp_mask,
		biop);
		}
		EXPORT_SYMBOL(__blkdev_issue_zeroout);

		@@ -360,18 +365,49 @@ EXPORT_SYMBOL(__blkdev_issue_zeroout);
		int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
		sector_t nr_sects, gfp_t gfp_mask, unsigned flags)
		{
		int ret;
		struct bio *bio = NULL;
		int ret = 0;
		sector_t bs_mask;
		struct bio *bio;
		struct blk_plug plug;
		bool try_write_zeroes = !!bdev_write_zeroes_sectors(bdev);

		bs_mask = (bdev_logical_block_size(bdev) >> 9) - 1;
		if ((sector \| nr_sects) & bs_mask)
		return -EINVAL;

		retry:
		bio = NULL;
		blk_start_plug(&plug);
		ret = __blkdev_issue_zeroout(bdev, sector, nr_sects, gfp_mask,
		&bio, flags);
		if (try_write_zeroes) {
		ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects,
		gfp_mask, &bio, flags);
		} else if (!(flags & BLKDEV_ZERO_NOFALLBACK)) {
		ret = __blkdev_issue_zero_pages(bdev, sector, nr_sects,
		gfp_mask, &bio);
		} else {
		/* No zeroing offload support */
		ret = -EOPNOTSUPP;
		}
		if (ret == 0 && bio) {
		ret = submit_bio_wait(bio);
		bio_put(bio);
		}
		blk_finish_plug(&plug);
		if (ret && try_write_zeroes) {
		if (!(flags & BLKDEV_ZERO_NOFALLBACK)) {
		try_write_zeroes = false;
		goto retry;
		}
		if (!bdev_write_zeroes_sectors(bdev)) {
		/*
		* Zeroing offload support was indicated, but the
		* device reported ILLEGAL REQUEST (for some devices
		* there is no non-destructive way to verify whether
		* WRITE ZEROES is actually supported).
		*/
		ret = -EOPNOTSUPP;
		}
		}

		return ret;
		}

drivers/block/drbd/drbd_worker.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,8 +282,8 @@ void drbd_request_endio(struct bio *bio)
		what = COMPLETED_OK;
		}

		bio_put(req->private_bio);
		req->private_bio = ERR_PTR(blk_status_to_errno(bio->bi_status));
		bio_put(bio);

		/* not req_mod(), we need irqsave here! */
		spin_lock_irqsave(&device->resource->req_lock, flags);