[{"id":1776370,"web_url":"http://patchwork.ozlabs.org/comment/1776370/","msgid":"","list_archive_url":null,"date":"2017-09-27T13:48:22","subject":"ACK: [SRU][Zesty][PATCH 1/1] scsi: ses: do not add a device to an\n\tenclosure if enclosure_add_links() fails.","submitter":{"id":2898,"url":"http://patchwork.ozlabs.org/api/people/2898/","name":"Stefan Bader","email":"stefan.bader@canonical.com"},"content":"On 20.09.2017 14:50, Joseph Salisbury wrote:\n> From: Maurizio Lombardi \n> \n> BugLink: http://bugs.launchpad.net/bugs/1693369\n> \n> The enclosure_add_device() function should fail if it can't create the\n> relevant sysfs links.\n> \n> Cc: \n> Signed-off-by: Maurizio Lombardi \n> Tested-by: Douglas Miller \n> Acked-by: James Bottomley \n> Signed-off-by: Martin K. Petersen \n> (cherry picked from commit 62e62ffd95539b9220894a7900a619e0f3ef4756)\n> Signed-off-by: Joseph Salisbury \nAcked-by: Stefan Bader \n\n> ---\n> drivers/misc/enclosure.c | 14 ++++++++++----\n> 1 file changed, 10 insertions(+), 4 deletions(-)\n> \n> diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c\n> index d3fe3ea..eb29113 100644\n> --- a/drivers/misc/enclosure.c\n> +++ b/drivers/misc/enclosure.c\n> @@ -375,6 +375,7 @@ int enclosure_add_device(struct enclosure_device *edev, int component,\n> \t\t\t struct device *dev)\n> {\n> \tstruct enclosure_component *cdev;\n> +\tint err;\n> \n> \tif (!edev || component >= edev->components)\n> \t\treturn -EINVAL;\n> @@ -384,12 +385,17 @@ int enclosure_add_device(struct enclosure_device *edev, int component,\n> \tif (cdev->dev == dev)\n> \t\treturn -EEXIST;\n> \n> -\tif (cdev->dev)\n> +\tif (cdev->dev) {\n> \t\tenclosure_remove_links(cdev);\n> -\n> -\tput_device(cdev->dev);\n> +\t\tput_device(cdev->dev);\n> +\t}\n> \tcdev->dev = get_device(dev);\n> -\treturn enclosure_add_links(cdev);\n> +\terr = enclosure_add_links(cdev);\n> +\tif (err) {\n> +\t\tput_device(cdev->dev);\n> +\t\tcdev->dev = NULL;\n> +\t}\n> +\treturn err;\n> }\n> EXPORT_SYMBOL_GPL(enclosure_add_device);\n> \n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=kernel-team-bounces@lists.ubuntu.com;\n\treceiver=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3y2K0m6lHfz9sRm;\n\tWed, 27 Sep 2017 23:48:40 +1000 (AEST)","from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1dxChW-0007a3-L1; Wed, 27 Sep 2017 13:48:34 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1dxChU-0007Zr-UR\n\tfor kernel-team@lists.ubuntu.com; Wed, 27 Sep 2017 13:48:32 +0000","from rrcs-69-193-151-51.nyc.biz.rr.com ([69.193.151.51]\n\thelo=[10.155.52.21]) by youngberry.canonical.com with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.76) (envelope-from )\n\tid 1dxChU-0001Xj-Ks\n\tfor kernel-team@lists.ubuntu.com; Wed, 27 Sep 2017 13:48:32 +0000"],"Subject":"ACK: [SRU][Zesty][PATCH 1/1] scsi: ses: do not add a device to an\n\tenclosure if enclosure_add_links() fails.","To":"kernel-team@lists.ubuntu.com","References":"\n\t","From":"Stefan Bader ","Message-ID":"","Date":"Wed, 27 Sep 2017 09:48:22 -0400","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"multipart/mixed;\n\tboundary=\"===============2598424915487679742==\"","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "}},{"id":1779606,"web_url":"http://patchwork.ozlabs.org/comment/1779606/","msgid":"","list_archive_url":null,"date":"2017-10-04T10:10:30","subject":"ACK: [SRU][Zesty][PATCH 1/1] scsi: ses: do not add a device to an\n\tenclosure if enclosure_add_links() fails.","submitter":{"id":2900,"url":"http://patchwork.ozlabs.org/api/people/2900/","name":"Colin Ian King","email":"colin.king@canonical.com"},"content":"On 20/09/17 19:50, Joseph Salisbury wrote:\n> From: Maurizio Lombardi \n> \n> BugLink: http://bugs.launchpad.net/bugs/1693369\n> \n> The enclosure_add_device() function should fail if it can't create the\n> relevant sysfs links.\n> \n> Cc: \n> Signed-off-by: Maurizio Lombardi \n> Tested-by: Douglas Miller \n> Acked-by: James Bottomley \n> Signed-off-by: Martin K. Petersen \n> (cherry picked from commit 62e62ffd95539b9220894a7900a619e0f3ef4756)\n> Signed-off-by: Joseph Salisbury \n> ---\n> drivers/misc/enclosure.c | 14 ++++++++++----\n> 1 file changed, 10 insertions(+), 4 deletions(-)\n> \n> diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c\n> index d3fe3ea..eb29113 100644\n> --- a/drivers/misc/enclosure.c\n> +++ b/drivers/misc/enclosure.c\n> @@ -375,6 +375,7 @@ int enclosure_add_device(struct enclosure_device *edev, int component,\n> \t\t\t struct device *dev)\n> {\n> \tstruct enclosure_component *cdev;\n> +\tint err;\n> \n> \tif (!edev || component >= edev->components)\n> \t\treturn -EINVAL;\n> @@ -384,12 +385,17 @@ int enclosure_add_device(struct enclosure_device *edev, int component,\n> \tif (cdev->dev == dev)\n> \t\treturn -EEXIST;\n> \n> -\tif (cdev->dev)\n> +\tif (cdev->dev) {\n> \t\tenclosure_remove_links(cdev);\n> -\n> -\tput_device(cdev->dev);\n> +\t\tput_device(cdev->dev);\n> +\t}\n> \tcdev->dev = get_device(dev);\n> -\treturn enclosure_add_links(cdev);\n> +\terr = enclosure_add_links(cdev);\n> +\tif (err) {\n> +\t\tput_device(cdev->dev);\n> +\t\tcdev->dev = NULL;\n> +\t}\n> +\treturn err;\n> }\n> EXPORT_SYMBOL_GPL(enclosure_add_device);\n> \n> \nClean cherry pick and positive test results.\n\nAcked-by: Colin Ian King ","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=kernel-team-bounces@lists.ubuntu.com;\n\treceiver=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3y6Wqw2QDPz9sRV;\n\tWed, 4 Oct 2017 21:10:36 +1100 (AEDT)","from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1dzgdM-0002Eo-Ri; Wed, 04 Oct 2017 10:10:32 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1dzgdL-0002Dc-Fi\n\tfor kernel-team@lists.ubuntu.com; Wed, 04 Oct 2017 10:10:31 +0000","from 1.general.cking.uk.vpn ([10.172.193.212])\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.76) (envelope-from )\n\tid 1dzgdL-0001wA-7C; Wed, 04 Oct 2017 10:10:31 +0000"],"Subject":"ACK: [SRU][Zesty][PATCH 1/1] scsi: ses: do not add a device to an\n\tenclosure if enclosure_add_links() fails.","To":"kernel-team@lists.ubuntu.com","References":"\n\t","From":"Colin Ian King ","Message-ID":"","Date":"Wed, 4 Oct 2017 11:10:30 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101\n\tThunderbird/45.8.0","MIME-Version":"1.0","In-Reply-To":"","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "}},{"id":1782884,"web_url":"http://patchwork.ozlabs.org/comment/1782884/","msgid":"<20171009141952.oskqbwnl4vnpii4o@calabresa>","list_archive_url":null,"date":"2017-10-09T14:19:53","subject":"APPLIED: [SRU][Zesty][PATCH 1/1] scsi: ses: do not add a device to\n\tan enclosure if enclosure_add_links() fails.","submitter":{"id":70574,"url":"http://patchwork.ozlabs.org/api/people/70574/","name":"Thadeu Lima de Souza Cascardo","email":"cascardo@canonical.com"},"content":"Applied to zesty master-next branch.\n\nThanks.\nCascardo.\n\nApplied-to: zesty/master-next","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com\n\t(client-ip=91.189.94.19; helo=huckleberry.canonical.com;\n\tenvelope-from=kernel-team-bounces@lists.ubuntu.com;\n\treceiver=)","Received":["from huckleberry.canonical.com (huckleberry.canonical.com\n\t[91.189.94.19])\n\tby ozlabs.org (Postfix) with ESMTP id 3y9j7R4fPrz9t6N;\n\tTue, 10 Oct 2017 01:20:03 +1100 (AEDT)","from localhost ([127.0.0.1] helo=huckleberry.canonical.com)\n\tby huckleberry.canonical.com with esmtp (Exim 4.86_2)\n\t(envelope-from )\n\tid 1e1YuV-0004JC-BT; Mon, 09 Oct 2017 14:19:59 +0000","from youngberry.canonical.com ([91.189.89.112])\n\tby huckleberry.canonical.com with esmtps\n\t(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128)\n\t(Exim 4.86_2) (envelope-from )\n\tid 1e1YuT-0004It-TM\n\tfor kernel-team@lists.ubuntu.com; Mon, 09 Oct 2017 14:19:57 +0000","from [177.94.55.56] (helo=calabresa)\n\tby youngberry.canonical.com with esmtpsa\n\t(TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.76) (envelope-from )\n\tid 1e1YuT-0000oa-80; Mon, 09 Oct 2017 14:19:57 +0000"],"Date":"Mon, 9 Oct 2017 11:19:53 -0300","From":"Thadeu Lima de Souza Cascardo ","To":"Joseph Salisbury ","Subject":"APPLIED: [SRU][Zesty][PATCH 1/1] scsi: ses: do not add a device to\n\tan enclosure if enclosure_add_links() fails.","Message-ID":"<20171009141952.oskqbwnl4vnpii4o@calabresa>","References":"\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","User-Agent":"NeoMutt/20170113 (1.7.2)","X-BeenThere":"kernel-team@lists.ubuntu.com","X-Mailman-Version":"2.1.20","Precedence":"list","List-Id":"Kernel team discussions ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kernel-team@lists.ubuntu.com","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"kernel-team-bounces@lists.ubuntu.com","Sender":"\"kernel-team\" "}}]