Merge tag 'dm-4.3-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (045ce743) · Commits · 戴 / test

drivers/md/dm-snap-persistent.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -847,6 +847,7 @@ static void persistent_drop_snapshot(struct dm_exception_store *store)
		static int persistent_ctr(struct dm_exception_store store, char options)
		{
		struct pstore *ps;
		int r;

		/* allocate the pstore */
		ps = kzalloc(sizeof(*ps), GFP_KERNEL);
		@@ -868,9 +869,9 @@ static int persistent_ctr(struct dm_exception_store store, char options)

		ps->metadata_wq = alloc_workqueue("ksnaphd", WQ_MEM_RECLAIM, 0);
		if (!ps->metadata_wq) {
		kfree(ps);
		DMERR("couldn't start header metadata update thread");
		return -ENOMEM;
		r = -ENOMEM;
		goto err_workqueue;
		}

		if (options) {
		@@ -879,13 +880,21 @@ static int persistent_ctr(struct dm_exception_store store, char options)
		store->userspace_supports_overflow = true;
		else {
		DMERR("Unsupported persistent store option: %s", options);
		return -EINVAL;
		r = -EINVAL;
		goto err_options;
		}
		}

		store->context = ps;

		return 0;

		err_options:
		destroy_workqueue(ps->metadata_wq);
		err_workqueue:
		kfree(ps);

		return r;
		}

		static unsigned persistent_status(struct dm_exception_store *store,

+1 −1

Original line number	Diff line number	Diff line
		@@ -3201,7 +3201,7 @@ static int pool_ctr(struct dm_target ti, unsigned argc, char *argv)
		metadata_low_callback,
		pool);
		if (r)
		goto out_free_pt;
		goto out_flags_changed;

		pt->callbacks.congested_fn = pool_is_congested;
		dm_table_add_target_callbacks(ti->table, &pt->callbacks);