Merge tag 'for-3.19-rc' of... (44089339) · Commits · 戴 / test

drivers/md/dm-thin.c

+23 −6

Original line number	Diff line number	Diff line
		@@ -1127,6 +1127,24 @@ static void schedule_external_copy(struct thin_c *tc, dm_block_t virt_block,
		schedule_zero(tc, virt_block, data_dest, cell, bio);
		}

		static void set_pool_mode(struct pool *pool, enum pool_mode new_mode);

		static void check_for_space(struct pool *pool)
		{
		int r;
		dm_block_t nr_free;

		if (get_pool_mode(pool) != PM_OUT_OF_DATA_SPACE)
		return;

		r = dm_pool_get_free_block_count(pool->pmd, &nr_free);
		if (r)
		return;

		if (nr_free)
		set_pool_mode(pool, PM_WRITE);
		}

		/*
		* A non-zero return indicates read_only or fail_io mode.
		* Many callers don't care about the return value.
		@@ -1141,6 +1159,8 @@ static int commit(struct pool *pool)
		r = dm_pool_commit_metadata(pool->pmd);
		if (r)
		metadata_operation_failed(pool, "dm_pool_commit_metadata", r);
		else
		check_for_space(pool);

		return r;
		}
		@@ -1159,8 +1179,6 @@ static void check_low_water_mark(struct pool *pool, dm_block_t free_blocks)
		}
		}

		static void set_pool_mode(struct pool *pool, enum pool_mode new_mode);

		static int alloc_data_block(struct thin_c tc, dm_block_t result)
		{
		int r;
		@@ -2155,7 +2173,7 @@ static void set_pool_mode(struct pool *pool, enum pool_mode new_mode)
		pool->process_cell = process_cell_read_only;
		pool->process_discard_cell = process_discard_cell;
		pool->process_prepared_mapping = process_prepared_mapping;
		pool->process_prepared_discard = process_prepared_discard_passdown;
		pool->process_prepared_discard = process_prepared_discard;

		if (!pool->pf.error_if_no_space && no_space_timeout)
		queue_delayed_work(pool->wq, &pool->no_space_timeout, no_space_timeout);
		@@ -3814,6 +3832,8 @@ static int thin_ctr(struct dm_target ti, unsigned argc, char *argv)
		r = -EINVAL;
		goto bad;
		}
		atomic_set(&tc->refcount, 1);
		init_completion(&tc->can_destroy);
		list_add_tail_rcu(&tc->list, &tc->pool->active_thins);
		spin_unlock_irqrestore(&tc->pool->lock, flags);
		/*
		@@ -3826,9 +3846,6 @@ static int thin_ctr(struct dm_target ti, unsigned argc, char *argv)

		dm_put(pool_md);

		atomic_set(&tc->refcount, 1);
		init_completion(&tc->can_destroy);

		return 0;

		bad:

drivers/md/dm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -899,7 +899,7 @@ static void disable_write_same(struct mapped_device *md)

		static void clone_endio(struct bio *bio, int error)
		{
		int r = 0;
		int r = error;
		struct dm_target_io *tio = container_of(bio, struct dm_target_io, clone);
		struct dm_io *io = tio->io;
		struct mapped_device *md = tio->io->md;

drivers/phy/phy-miphy28lp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1050,7 +1050,8 @@ static int miphy28lp_init(struct phy *phy)
		ret = miphy28lp_init_usb3(miphy_phy);
		break;
		default:
		return -EINVAL;
		ret = -EINVAL;
		break;
		}

		mutex_unlock(&miphy_dev->miphy_mutex);

drivers/phy/phy-omap-control.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -29,10 +29,9 @@
		/**
		* omap_control_pcie_pcs - set the PCS delay count
		* @dev: the control module device
		* @id: index of the pcie PHY (should be 1 or 2)
		* @delay: 8 bit delay value
		*/
		void omap_control_pcie_pcs(struct device *dev, u8 id, u8 delay)
		void omap_control_pcie_pcs(struct device *dev, u8 delay)
		{
		u32 val;
		struct omap_control_phy *control_phy;
		@@ -55,8 +54,8 @@ void omap_control_pcie_pcs(struct device *dev, u8 id, u8 delay)

		val = readl(control_phy->pcie_pcs);
		val &= ~(OMAP_CTRL_PCIE_PCS_MASK <<
		(id * OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT));
		val \|= delay << (id * OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT);
		OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT);
		val \|= (delay << OMAP_CTRL_PCIE_PCS_DELAY_COUNT_SHIFT);
		writel(val, control_phy->pcie_pcs);
		}
		EXPORT_SYMBOL_GPL(omap_control_pcie_pcs);

drivers/phy/phy-sun4i-usb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -244,7 +244,8 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
		else
		data->num_phys = 3;

		if (of_device_is_compatible(np, "allwinner,sun4i-a10-usb-phy"))
		if (of_device_is_compatible(np, "allwinner,sun4i-a10-usb-phy") \|\|
		of_device_is_compatible(np, "allwinner,sun6i-a31-usb-phy"))
		data->disc_thresh = 3;
		else
		data->disc_thresh = 2;

Admin message