diff for duplicates of <20140523001730.GA12584@shangw> diff --git a/a/1.txt b/N1/1.txt index 0af6137..a3a00f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -601,7 +601,7 @@ recovery. Lets keep it. >>+ int ret; >> if (!try_module_get(THIS_MODULE)) >> return -ENODEV; ->> if (atomic_inc_return(&vdev->refcnt) = 1) { +>> if (atomic_inc_return(&vdev->refcnt) == 1) { >>- int ret = vfio_pci_enable(vdev); >>- if (ret) { >>- module_put(THIS_MODULE); @@ -715,11 +715,11 @@ recovery. Lets keep it. >>@@ -682,6 +795,12 @@ hot_reset_release: >> kfree(groups); >> return ret; ->>+ } else if (cmd = VFIO_EEH_PE_SET_OPTION || ->>+ cmd = VFIO_EEH_PE_GET_ADDR || ->>+ cmd = VFIO_EEH_PE_GET_STATE || ->>+ cmd = VFIO_EEH_PE_RESET || ->>+ cmd = VFIO_EEH_PE_CONFIGURE) { +>>+ } else if (cmd == VFIO_EEH_PE_SET_OPTION || +>>+ cmd == VFIO_EEH_PE_GET_ADDR || +>>+ cmd == VFIO_EEH_PE_GET_STATE || +>>+ cmd == VFIO_EEH_PE_RESET || +>>+ cmd == VFIO_EEH_PE_CONFIGURE) { >>+ return vfio_eeh_pci_ioctl(vdev->pdev, cmd, arg); >> } >> return -ENOTTY; diff --git a/a/content_digest b/N1/content_digest index 03ec468..fd54bfe 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0537DC991.9010401@suse.de\0" "From\0Gavin Shan <gwshan@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 2/3] drivers/vfio: EEH support for VFIO PCI device\0" - "Date\0Fri, 23 May 2014 00:17:30 +0000\0" + "Date\0Fri, 23 May 2014 10:17:30 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0aik@ozlabs.ru" Gavin Shan <gwshan@linux.vnet.ibm.com> @@ -616,7 +616,7 @@ ">>+\tint ret;\n" ">> \tif (!try_module_get(THIS_MODULE))\n" ">> \t\treturn -ENODEV;\n" - ">> \tif (atomic_inc_return(&vdev->refcnt) = 1) {\n" + ">> \tif (atomic_inc_return(&vdev->refcnt) == 1) {\n" ">>-\t\tint ret = vfio_pci_enable(vdev);\n" ">>-\t\tif (ret) {\n" ">>-\t\t\tmodule_put(THIS_MODULE);\n" @@ -730,11 +730,11 @@ ">>@@ -682,6 +795,12 @@ hot_reset_release:\n" ">> \t\tkfree(groups);\n" ">> \t\treturn ret;\n" - ">>+\t} else if (cmd = VFIO_EEH_PE_SET_OPTION ||\n" - ">>+\t\t cmd = VFIO_EEH_PE_GET_ADDR ||\n" - ">>+\t\t cmd = VFIO_EEH_PE_GET_STATE ||\n" - ">>+\t\t cmd = VFIO_EEH_PE_RESET ||\n" - ">>+\t\t cmd = VFIO_EEH_PE_CONFIGURE) {\n" + ">>+\t} else if (cmd == VFIO_EEH_PE_SET_OPTION ||\n" + ">>+\t\t cmd == VFIO_EEH_PE_GET_ADDR ||\n" + ">>+\t\t cmd == VFIO_EEH_PE_GET_STATE ||\n" + ">>+\t\t cmd == VFIO_EEH_PE_RESET ||\n" + ">>+\t\t cmd == VFIO_EEH_PE_CONFIGURE) {\n" ">>+\t\t\treturn vfio_eeh_pci_ioctl(vdev->pdev, cmd, arg);\n" ">> \t}\n" ">> \treturn -ENOTTY;\n" @@ -824,4 +824,4 @@ "Thanks,\n" Gavin -fbe82227ea9bda44bfc7f9b191533b9da63395b103ca790a9faed87b1053c222 +729d5fe1052ae0f485ff66bced9dcc0a8c23d4d17747e67ed0516121fc7e3b45
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.