diff options
| author | Greg Kroah-Hartman | 2013-07-25 00:05:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-07-27 03:05:18 +0200 |
| commit | 4183fb9503e117ef6d7564a4dbdf0582c5d638ad (patch) | |
| tree | af31de1bab3a9b9b62e29cc1b7a68d143f288de7 /fs/fuse/cuse.c | |
| parent | PTP: convert class code to use dev_groups (diff) | |
| download | kernel-qcow2-linux-4183fb9503e117ef6d7564a4dbdf0582c5d638ad.tar.gz kernel-qcow2-linux-4183fb9503e117ef6d7564a4dbdf0582c5d638ad.tar.xz kernel-qcow2-linux-4183fb9503e117ef6d7564a4dbdf0582c5d638ad.zip | |
cuse: convert class code to use dev_groups
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.
Acked-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/fuse/cuse.c')
| -rw-r--r-- | fs/fuse/cuse.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c index aef34b1e635e..adbfd66b380f 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) { |