From patchwork Mon Jan 11 17:28:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ewan Milne X-Patchwork-Id: 8007061 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DEDA29F1C0 for ; Mon, 11 Jan 2016 17:28:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1465A2026C for ; Mon, 11 Jan 2016 17:28:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B7BE20328 for ; Mon, 11 Jan 2016 17:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761418AbcAKR2c (ORCPT ); Mon, 11 Jan 2016 12:28:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39938 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759119AbcAKR2a (ORCPT ); Mon, 11 Jan 2016 12:28:30 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 26AB18E386; Mon, 11 Jan 2016 17:28:30 +0000 (UTC) Received: from emilne.csb (dhcp-25-104.bos.redhat.com [10.18.25.104]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0BHSSio003254; Mon, 11 Jan 2016 12:28:29 -0500 From: "Ewan D. Milne" To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org Cc: gregkh@linuxfoundation.org, martin.petersen@oracle.com, hare@suse.com Subject: [PATCH 1/2] drivers/base: add bus_device_iter_init, bus_device_iter_next, bus_device_iter_exit Date: Mon, 11 Jan 2016 12:28:26 -0500 Message-Id: <1452533307-30142-2-git-send-email-emilne@redhat.com> In-Reply-To: <1452533307-30142-1-git-send-email-emilne@redhat.com> References: <1452533307-30142-1-git-send-email-emilne@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Ewan D. Milne" These functions are needed to expose an iterator for SCSI usage. From a patch originally developed by David Jeffery Signed-off-by: Ewan D. Milne Reviewed-by: Hannes Reinecke --- drivers/base/bus.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/device.h | 5 +++++ 2 files changed, 64 insertions(+) diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 5005924..a472e46 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -318,6 +318,65 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start, EXPORT_SYMBOL_GPL(bus_for_each_dev); /** + * bus_device_iter_init - Initialize an iterator for walking a bus's devices. + * @iter: iterator structure to initialize + * @bus: bus type + * + * Initializes an iterator for safely walking a bus's list of devices. The + * iterator can be used by bus_device_iter_next() to safely walk the list, even + * if a device is removed from the list while being examined. Needs to be + * matched with a call to bus_device_iter_exit() to clean up the iterator when + * finished. + * + * Return 0 on success, non-zero on failure. Iterator cannot be used + * for a non-zero result + */ +int bus_device_iter_init(struct klist_iter *iter, + struct bus_type *bus) +{ + if (!bus || !bus->p) + return -EINVAL; + + klist_iter_init_node(&bus->p->klist_devices, iter, NULL); + return 0; +} +EXPORT_SYMBOL_GPL(bus_device_iter_init); + +/** + * bus_device_iter_next - Get a bus's next device from the iterator. + * @iter: iterator structure from bus_device_iter_init() + * + * Finds the next valid device entry on a bus's device list. Allows the list + * to be safely traversed by the caller even when other tasks remove devices + * from the list. + * + * Returns a reference to the next device, or NULL if no more devices. + */ +struct device *bus_device_iter_next(struct klist_iter *iter) +{ + struct device *dev; + + while ((dev = next_device(iter))) + if (get_device(dev)) + break; + + return dev; +} +EXPORT_SYMBOL_GPL(bus_device_iter_next); + +/** + * bus_device_iter_exit - Clean up an iterator from walking a bus's device list. + * @iter: iterator structure from bus_device_iter_init() to clean up + * + * Clean up any remaining state after finishing walking a bus's device list. + */ +void bus_device_iter_exit(struct klist_iter *iter) +{ + klist_iter_exit(iter); +} +EXPORT_SYMBOL_GPL(bus_device_iter_exit); + +/** * bus_find_device - device iterator for locating a particular device. * @bus: bus type * @start: Device to begin with diff --git a/include/linux/device.h b/include/linux/device.h index b8f411b..a44d912 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -151,6 +151,11 @@ void subsys_dev_iter_exit(struct subsys_dev_iter *iter); int bus_for_each_dev(struct bus_type *bus, struct device *start, void *data, int (*fn)(struct device *dev, void *data)); + +int bus_device_iter_init(struct klist_iter *iter, struct bus_type *bus); +struct device *bus_device_iter_next(struct klist_iter *iter); +void bus_device_iter_exit(struct klist_iter *iter); + struct device *bus_find_device(struct bus_type *bus, struct device *start, void *data, int (*match)(struct device *dev, void *data));