Merge tag 'for-linus-5.5b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (b01d7cb4) · Commits · 戴 / test

drivers/block/xen-blkback/xenbus.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,15 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid)
		blkif->domid = domid;
		atomic_set(&blkif->refcnt, 1);
		init_completion(&blkif->drain_complete);

		/*
		* Because freeing back to the cache may be deferred, it is not
		* safe to unload the module (and hence destroy the cache) until
		* this has completed. To prevent premature unloading, take an
		* extra module reference here and release only when the object
		* has been freed back to the cache.
		*/
		__module_get(THIS_MODULE);
		INIT_WORK(&blkif->free_work, xen_blkif_deferred_free);

		return blkif;
		@@ -320,6 +329,7 @@ static void xen_blkif_free(struct xen_blkif *blkif)

		/* Make sure everything is drained before shutting down */
		kmem_cache_free(xen_blkif_cachep, blkif);
		module_put(THIS_MODULE);
		}

		int __init xen_blkif_interface_init(void)

+2 −1

Original line number	Diff line number	Diff line
		@@ -394,7 +394,8 @@ static struct notifier_block xen_memory_nb = {
		#else
		static enum bp_state reserve_additional_memory(void)
		{
		balloon_stats.target_pages = balloon_stats.current_pages;
		balloon_stats.target_pages = balloon_stats.current_pages +
		balloon_stats.target_unpopulated;
		return BP_ECANCELED;
		}
		#endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */