From: Linus Torvalds Date: Fri, 10 Oct 2008 18:11:47 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0af205afb111e17ac8db64c3b9c4f2c332de92a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge git://git./linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm: detect lost queue dm: publish dm_vcalloc dm: publish dm_table_unplug_all dm: publish dm_get_mapinfo dm: export struct dm_dev dm crypt: avoid unnecessary wait when splitting bio dm crypt: tidy ctx pending dm crypt: fix async inc_pending dm crypt: move dec_pending on error into write_io_submit dm crypt: remove inc_pending from write_io_submit dm crypt: tidy write loop pending dm crypt: tidy crypt alloc dm crypt: tidy inc pending dm exception store: use chunk_t for_areas dm exception store: introduce area_location function dm raid1: kcopyd should stop on error if errors handled dm mpath: remove is_active from struct dm_path dm mpath: use more error codes Fixed up trivial conflict in drivers/md/dm-mpath.c manually. --- b0af205afb111e17ac8db64c3b9c4f2c332de92a diff --cc drivers/md/dm-mpath.c index 3d3848132c69,b2ab8489d0eb..103304c1e3b0 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@@ -124,10 -123,8 +125,10 @@@ static struct pgpath *alloc_pgpath(void { struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL); - if (pgpath) + if (pgpath) { - pgpath->path.is_active = 1; + pgpath->is_active = 1; + INIT_WORK(&pgpath->deactivate_path, deactivate_path); + } return pgpath; }