diff for duplicates of <20080723183548.GR12905@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 863bf8b..9c5e227 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -From: Brian King <brking@linux.vnet.ibm.com> +=46rom: Brian King <brking@linux.vnet.ibm.com> Adds support to the ibmvfc driver for collaborative memory overcommit. @@ -14,13 +14,15 @@ change set for this feature. We are copying linux-scsi for review and ack. 1 file changed, 15 insertions(+) Index: b/drivers/scsi/ibmvscsi/ibmvfc.c -=================================================================== +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c -@@ -3819,6 +3819,20 @@ static int ibmvfc_remove(struct vio_dev +@@ -3819,6 +3819,20 @@ static int ibmvfc_remove(struct vio_dev=20 return 0; } - +=20 +/** + * ibmvfc_get_desired_dma - Calculate DMA resources needed by the driver + * @vdev: vio device struct @@ -31,18 +33,18 @@ Index: b/drivers/scsi/ibmvscsi/ibmvfc.c + */ +static unsigned long ibmvfc_get_desired_dma(struct vio_dev *vdev) +{ -+ unsigned long pool_dma = max_requests * sizeof(union ibmvfc_iu); ++ unsigned long pool_dma =3D max_requests * sizeof(union ibmvfc_iu); + return pool_dma + ((512 * 1024) * driver_template.cmd_per_lun); +} + - static struct vio_device_id ibmvfc_device_table[] __devinitdata = { + static struct vio_device_id ibmvfc_device_table[] __devinitdata =3D { {"fcp", "IBM,vfc-client"}, { "", "" } -@@ -3829,6 +3843,7 @@ static struct vio_driver ibmvfc_driver = - .id_table = ibmvfc_device_table, - .probe = ibmvfc_probe, - .remove = ibmvfc_remove, -+ .get_desired_dma = ibmvfc_get_desired_dma, - .driver = { - .name = IBMVFC_NAME, - .owner = THIS_MODULE, +@@ -3829,6 +3843,7 @@ static struct vio_driver ibmvfc_driver =3D + .id_table =3D ibmvfc_device_table, + .probe =3D ibmvfc_probe, + .remove =3D ibmvfc_remove, ++ .get_desired_dma =3D ibmvfc_get_desired_dma, + .driver =3D { + .name =3D IBMVFC_NAME, + .owner =3D THIS_MODULE, diff --git a/a/content_digest b/N1/content_digest index 595f709..13f300e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,15 +4,13 @@ "Date\0Wed, 23 Jul 2008 13:35:48 -0500\0" "To\0paulus@samba.org" " benh@kernel.crashing.org\0" - "Cc\0linuxppc-dev@ozlabs.org" - linux-scsi@vger.kernel.org - Brian King <brking@linux.vnet.ibm.com> - Santiago Leon <santil@us.ibm.com> - Nathan Fontenot <nfont@austin.ibm.com> - " David Darrington <ddarring@linux.vnet.ibm.com>\0" + "Cc\0linux-scsi@vger.kernel.org" + linuxppc-dev@ozlabs.org + David Darrington <ddarring@linux.vnet.ibm.com> + " Brian King <brking@linux.vnet.ibm.com>\0" "\00:1\0" "b\0" - "From: Brian King <brking@linux.vnet.ibm.com>\n" + "=46rom: Brian King <brking@linux.vnet.ibm.com>\n" "\n" "Adds support to the ibmvfc driver for collaborative memory overcommit.\n" "\n" @@ -28,13 +26,15 @@ " 1 file changed, 15 insertions(+)\n" "\n" "Index: b/drivers/scsi/ibmvscsi/ibmvfc.c\n" - "===================================================================\n" + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=\n" + "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" "--- a/drivers/scsi/ibmvscsi/ibmvfc.c\n" "+++ b/drivers/scsi/ibmvscsi/ibmvfc.c\n" - "@@ -3819,6 +3819,20 @@ static int ibmvfc_remove(struct vio_dev \n" + "@@ -3819,6 +3819,20 @@ static int ibmvfc_remove(struct vio_dev=20\n" " \treturn 0;\n" " }\n" - " \n" + "=20\n" "+/**\n" "+ * ibmvfc_get_desired_dma - Calculate DMA resources needed by the driver\n" "+ * @vdev:\tvio device struct\n" @@ -45,20 +45,20 @@ "+ */\n" "+static unsigned long ibmvfc_get_desired_dma(struct vio_dev *vdev)\n" "+{\n" - "+\tunsigned long pool_dma = max_requests * sizeof(union ibmvfc_iu);\n" + "+\tunsigned long pool_dma =3D max_requests * sizeof(union ibmvfc_iu);\n" "+\treturn pool_dma + ((512 * 1024) * driver_template.cmd_per_lun);\n" "+}\n" "+\n" - " static struct vio_device_id ibmvfc_device_table[] __devinitdata = {\n" + " static struct vio_device_id ibmvfc_device_table[] __devinitdata =3D {\n" " \t{\"fcp\", \"IBM,vfc-client\"},\n" " \t{ \"\", \"\" }\n" - "@@ -3829,6 +3843,7 @@ static struct vio_driver ibmvfc_driver =\n" - " \t.id_table = ibmvfc_device_table,\n" - " \t.probe = ibmvfc_probe,\n" - " \t.remove = ibmvfc_remove,\n" - "+\t.get_desired_dma = ibmvfc_get_desired_dma,\n" - " \t.driver = {\n" - " \t\t.name = IBMVFC_NAME,\n" - " \t\t.owner = THIS_MODULE," + "@@ -3829,6 +3843,7 @@ static struct vio_driver ibmvfc_driver =3D\n" + " \t.id_table =3D ibmvfc_device_table,\n" + " \t.probe =3D ibmvfc_probe,\n" + " \t.remove =3D ibmvfc_remove,\n" + "+\t.get_desired_dma =3D ibmvfc_get_desired_dma,\n" + " \t.driver =3D {\n" + " \t\t.name =3D IBMVFC_NAME,\n" + " \t\t.owner =3D THIS_MODULE," -746d460da8607faa54d073759db53c83c3d69295da1c2cb9222f4c8997b33412 +4ec03da73fee60432b59eeff2ab34fae3dcdcfa94e945ac679e25f11a6aa2170
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.