diff for duplicates of <20150602100958.GC11247@mwanda> diff --git a/a/1.txt b/N1/1.txt index 461937b..c4073fb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ Smatch found some error paths that don't unlock. Also we can return -ENOMEM instead of -1 if we don't have an old root entry. Fixes: 5908f10af4b9 ('iommu/vt-d: datatypes and functions used for kdump') -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> --- Releasing the lock is good, but we might need to do other error handling as well. Presumably this function always succeeds anyway? It seems @@ -13,7 +13,8 @@ index 2926907..0e2e635 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5151,22 +5151,24 @@ static int intel_iommu_load_translation_tables(struct intel_iommu *iommu) - iommu->root_entry (struct root_entry *)alloc_pgtable_page(iommu->node); + iommu->root_entry = + (struct root_entry *)alloc_pgtable_page(iommu->node); if (!iommu->root_entry) { - spin_unlock_irqrestore(&iommu->lock, flags); - return -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index 74187d4..e90e76a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" + "From\0Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0" "Subject\0[patch] iommu/vt-d: unlock on error in intel_iommu_load_translation_tables()\0" - "Date\0Tue, 02 Jun 2015 10:09:58 +0000\0" + "Date\0Tue, 2 Jun 2015 13:09:58 +0300\0" "To\0David Woodhouse <dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>" Li-p7QCHhHlqjPG026l+vzAeHxJsTq8ys+cHZ5vskTnxNA@public.gmane.org " Zhen-Hua <zhen-hual-VXdhtT5mjnY@public.gmane.org>\0" @@ -12,7 +12,7 @@ "-ENOMEM instead of -1 if we don't have an old root entry.\n" "\n" "Fixes: 5908f10af4b9 ('iommu/vt-d: datatypes and functions used for kdump')\n" - "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\n" "---\n" "Releasing the lock is good, but we might need to do other error handling\n" "as well. Presumably this function always succeeds anyway? It seems\n" @@ -23,7 +23,8 @@ "--- a/drivers/iommu/intel-iommu.c\n" "+++ b/drivers/iommu/intel-iommu.c\n" "@@ -5151,22 +5151,24 @@ static int intel_iommu_load_translation_tables(struct intel_iommu *iommu)\n" - " \t\tiommu->root_entry \t\t\t(struct root_entry *)alloc_pgtable_page(iommu->node);\n" + " \t\tiommu->root_entry =\n" + " \t\t\t(struct root_entry *)alloc_pgtable_page(iommu->node);\n" " \t\tif (!iommu->root_entry) {\n" "-\t\t\tspin_unlock_irqrestore(&iommu->lock, flags);\n" "-\t\t\treturn -ENOMEM;\n" @@ -62,4 +63,4 @@ " \n" static void unmap_device_dma(struct dmar_domain *domain, -cf4b2a046f946b45139c6e5bce4a568c4fb22514c2164c517d9acfbaac470e81 +cc1371c45f6b11ef5eaf80ba7564a8b7368b9e0ba22a8fe0b7b27a6f63653d72
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.