From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Ewan D. Milne" Subject: [PATCH 4/5] scsi: Change to use list_for_each_entry_safe Date: Mon, 26 Aug 2013 11:03:39 -0400 Message-ID: <1377529420-31775-5-git-send-email-emilne@redhat.com> References: <1377529420-31775-1-git-send-email-emilne@redhat.com> Return-path: Received: from mx1.redhat.com ([209.132.183.28]:61877 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751808Ab3HZPDn (ORCPT ); Mon, 26 Aug 2013 11:03:43 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7QF3hqb002247 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Aug 2013 11:03:43 -0400 Received: from emilne.csb ([10.18.25.104]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7QF3eJa014378 for ; Mon, 26 Aug 2013 11:03:42 -0400 In-Reply-To: <1377529420-31775-1-git-send-email-emilne@redhat.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: linux-scsi@vger.kernel.org From: "Ewan D. Milne" scsi_device_dev_release_usercontext() should be using "list_for_each_entry_safe" instead of "list_for_each_safe". Signed-off-by: Ewan D. Milne --- drivers/scsi/scsi_sysfs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 7394a77..34f7580 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -335,7 +335,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) struct scsi_device *sdev; struct device *parent; struct scsi_target *starget; - struct list_head *this, *tmp; + struct scsi_event *evt, *next; unsigned long flags; sdev = container_of(work, struct scsi_device, ew.work); @@ -352,10 +352,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) cancel_work_sync(&sdev->event_work); - list_for_each_safe(this, tmp, &sdev->event_list) { - struct scsi_event *evt; - - evt = list_entry(this, struct scsi_event, node); + list_for_each_entry_safe(evt, next, &sdev->event_list, node) { list_del(&evt->node); kfree(evt); } -- 1.7.11.7