All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Yehuda Sadeh <yehuda@inktank.com>, Sage Weil <sage@inktank.com>,
	Alex Elder <elder@inktank.com>, <ceph-devel@vger.kernel.org>
Subject: [PATCH 02/15] rbd: convert bus code to use bus_groups
Date: Fri, 23 Aug 2013 14:24:28 -0700	[thread overview]
Message-ID: <1377293081-10957-2-git-send-email-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <1377293081-10957-1-git-send-email-gregkh@linuxfoundation.org>

The bus_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the RBD bus code to use the
correct field.

Cc: Yehuda Sadeh <yehuda@inktank.com>
Cc: Sage Weil <sage@inktank.com>
Cc: Alex Elder <elder@inktank.com>
Cc: <ceph-devel@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/block/rbd.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4ad2ad9a..191cd177 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -397,15 +397,19 @@ static ssize_t rbd_remove(struct bus_type *bus, const char *buf,
 static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);
 static void rbd_spec_put(struct rbd_spec *spec);
 
-static struct bus_attribute rbd_bus_attrs[] = {
-	__ATTR(add, S_IWUSR, NULL, rbd_add),
-	__ATTR(remove, S_IWUSR, NULL, rbd_remove),
-	__ATTR_NULL
+static BUS_ATTR(add, S_IWUSR, NULL, rbd_add);
+static BUS_ATTR(remove, S_IWUSR, NULL, rbd_remove);
+
+static struct attribute *rbd_bus_attrs[] = {
+	&bus_attr_add.attr,
+	&bus_attr_remove.attr,
+	NULL,
 };
+ATTRIBUTE_GROUPS(rbd_bus);
 
 static struct bus_type rbd_bus_type = {
 	.name		= "rbd",
-	.bus_attrs	= rbd_bus_attrs,
+	.bus_groups	= rbd_bus_groups,
 };
 
 static void rbd_root_dev_release(struct device *dev)
-- 
1.8.3.rc0.20.gb99dd2e


WARNING: multiple messages have this Message-ID (diff)
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Yehuda Sadeh <yehuda@inktank.com>, Sage Weil <sage@inktank.com>,
	Alex Elder <elder@inktank.com>,
	ceph-devel@vger.kernel.org
Subject: [PATCH 02/15] rbd: convert bus code to use bus_groups
Date: Fri, 23 Aug 2013 14:24:28 -0700	[thread overview]
Message-ID: <1377293081-10957-2-git-send-email-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <1377293081-10957-1-git-send-email-gregkh@linuxfoundation.org>

The bus_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the RBD bus code to use the
correct field.

Cc: Yehuda Sadeh <yehuda@inktank.com>
Cc: Sage Weil <sage@inktank.com>
Cc: Alex Elder <elder@inktank.com>
Cc: <ceph-devel@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/block/rbd.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4ad2ad9a..191cd177 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -397,15 +397,19 @@ static ssize_t rbd_remove(struct bus_type *bus, const char *buf,
 static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping);
 static void rbd_spec_put(struct rbd_spec *spec);
 
-static struct bus_attribute rbd_bus_attrs[] = {
-	__ATTR(add, S_IWUSR, NULL, rbd_add),
-	__ATTR(remove, S_IWUSR, NULL, rbd_remove),
-	__ATTR_NULL
+static BUS_ATTR(add, S_IWUSR, NULL, rbd_add);
+static BUS_ATTR(remove, S_IWUSR, NULL, rbd_remove);
+
+static struct attribute *rbd_bus_attrs[] = {
+	&bus_attr_add.attr,
+	&bus_attr_remove.attr,
+	NULL,
 };
+ATTRIBUTE_GROUPS(rbd_bus);
 
 static struct bus_type rbd_bus_type = {
 	.name		= "rbd",
-	.bus_attrs	= rbd_bus_attrs,
+	.bus_groups	= rbd_bus_groups,
 };
 
 static void rbd_root_dev_release(struct device *dev)
-- 
1.8.3.rc0.20.gb99dd2e

  reply	other threads:[~2013-08-23 21:24 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-23 21:24 [PATCH 01/15] PCI: convert bus code to use bus_groups Greg Kroah-Hartman
2013-08-23 21:24 ` Greg Kroah-Hartman [this message]
2013-08-23 21:24   ` [PATCH 02/15] rbd: " Greg Kroah-Hartman
2013-08-27 12:35   ` Alex Elder
2013-08-28  5:07     ` Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 03/15] rapidio: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 04/15] PPC: ibmebus: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 05/15] PPC: VIO: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 06/15] SCSI: fcoe: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 07/15] Input: gameport: convert bus code to use drv_groups Greg Kroah-Hartman
2013-08-24 23:33   ` Dmitry Torokhov
2013-08-25 21:56     ` Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 08/15] Input: serio: " Greg Kroah-Hartman
2013-08-24 23:33   ` Dmitry Torokhov
2013-08-23 21:24 ` [PATCH 09/15] PCI: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 10/15] USB: serial: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 11/15] driver-core: platform: convert bus code to use dev_groups Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 12/15] HID: " Greg Kroah-Hartman
2013-08-26 11:42   ` Jiri Kosina
2013-08-26 12:05     ` Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 13/15] MEI: " Greg Kroah-Hartman
2013-08-23 21:27   ` Winkler, Tomas
2013-08-23 21:24 ` [PATCH 14/15] pmu_bus: " Greg Kroah-Hartman
2013-08-23 21:24 ` [PATCH 15/15] workqueue: " Greg Kroah-Hartman
2013-08-23 21:28   ` Tejun Heo
2013-08-23 21:34     ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377293081-10957-2-git-send-email-gregkh@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=ceph-devel@vger.kernel.org \
    --cc=elder@inktank.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sage@inktank.com \
    --cc=yehuda@inktank.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.