Messages in this thread | | | Date | Fri, 26 Jul 2013 12:11:53 +0200 | Subject | Re: [PATCH 21/36] cuse: convert class code to use dev_groups | From | Miklos Szeredi <> |
| |
On Thu, Jul 25, 2013 at 12:05 AM, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > The dev_attrs field of struct class is going away soon, dev_groups > should be used instead. This converts the cuse class code to use the > correct field. > > Cc: Miklos Szeredi <miklos@szeredi.hu> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > > Miklos, feel free to take this through your tree, or ACK it and I can > take it through mine.
Thanks, Greg. Please take it through your tree.
Acked-by: Miklos Szeredi <mszeredi@suse.cz>
Thanks, Miklos
> > fs/fuse/cuse.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c > index aef34b1e..adbfd66b 100644 > --- a/fs/fuse/cuse.c > +++ b/fs/fuse/cuse.c > @@ -568,6 +568,7 @@ static ssize_t cuse_class_waiting_show(struct device *dev, > > return sprintf(buf, "%d\n", atomic_read(&cc->fc.num_waiting)); > } > +static DEVICE_ATTR(waiting, S_IFREG | 0400, cuse_class_waiting_show, NULL); > > static ssize_t cuse_class_abort_store(struct device *dev, > struct device_attribute *attr, > @@ -578,12 +579,14 @@ static ssize_t cuse_class_abort_store(struct device *dev, > fuse_abort_conn(&cc->fc); > return count; > } > +static DEVICE_ATTR(abort, S_IFREG | 0200, NULL, cuse_class_abort_store); > > -static struct device_attribute cuse_class_dev_attrs[] = { > - __ATTR(waiting, S_IFREG | 0400, cuse_class_waiting_show, NULL), > - __ATTR(abort, S_IFREG | 0200, NULL, cuse_class_abort_store), > - { } > +static struct attribute *cuse_class_dev_attrs[] = { > + &dev_attr_waiting.attr, > + &dev_attr_abort.attr, > + NULL, > }; > +ATTRIBUTE_GROUPS(cuse_class_dev); > > static struct miscdevice cuse_miscdev = { > .minor = MISC_DYNAMIC_MINOR, > @@ -609,7 +612,7 @@ static int __init cuse_init(void) > if (IS_ERR(cuse_class)) > return PTR_ERR(cuse_class); > > - cuse_class->dev_attrs = cuse_class_dev_attrs; > + cuse_class->dev_groups = cuse_class_dev_groups; > > rc = misc_register(&cuse_miscdev); > if (rc) { > -- > 1.8.3.rc0.20.gb99dd2e >
| |