diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 15:43:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 15:43:27 -0700 |
| commit | 94ed31a17e12bd77b8a5982c6bf9623b9a623fe7 (patch) | |
| tree | 3468dad21566837ef07c8d4d6fe434fcaadd876a /backing-dev-convert-class-code-to-use-dev_groups.patch | |
| parent | aaf275f945460b5cb5ee6ea9ef95b06db5334461 (diff) | |
| download | patches-94ed31a17e12bd77b8a5982c6bf9623b9a623fe7.tar.gz | |
renamed patches and broke them up
Diffstat (limited to 'backing-dev-convert-class-code-to-use-dev_groups.patch')
| -rw-r--r-- | backing-dev-convert-class-code-to-use-dev_groups.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/backing-dev-convert-class-code-to-use-dev_groups.patch b/backing-dev-convert-class-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..710d2624e8a5d4 --- /dev/null +++ b/backing-dev-convert-class-code-to-use-dev_groups.patch @@ -0,0 +1,63 @@ +From foo@baz Tue Jul 9 15:34:49 PDT 2013 +Date: Tue, 09 Jul 2013 15:34:49 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: backing-dev: 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 backing device class code to +use the correct field. + +Cc: Andrew Morton <akpm@linux-foundation.org> +Cc: Jan Kara <jack@suse.cz> +Cc: Tejun Heo <tj@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + mm/backing-dev.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +--- a/mm/backing-dev.c ++++ b/mm/backing-dev.c +@@ -180,7 +180,8 @@ static ssize_t name##_show(struct device + struct backing_dev_info *bdi = dev_get_drvdata(dev); \ + \ + return snprintf(page, PAGE_SIZE-1, "%lld\n", (long long)expr); \ +-} ++} \ ++static DEVICE_ATTR_RW(name); + + BDI_SHOW(read_ahead_kb, K(bdi->ra_pages)) + +@@ -231,14 +232,16 @@ static ssize_t stable_pages_required_sho + return snprintf(page, PAGE_SIZE-1, "%d\n", + bdi_cap_stable_pages_required(bdi) ? 1 : 0); + } ++static DEVICE_ATTR_RO(stable_pages_required); + +-static struct device_attribute bdi_dev_attrs[] = { +- __ATTR_RW(read_ahead_kb), +- __ATTR_RW(min_ratio), +- __ATTR_RW(max_ratio), +- __ATTR_RO(stable_pages_required), +- __ATTR_NULL, ++static struct attribute *bdi_dev_attrs[] = { ++ &dev_attr_read_ahead_kb.attr, ++ &dev_attr_min_ratio.attr, ++ &dev_attr_max_ratio.attr, ++ &dev_attr_stable_pages_required.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(bdi_dev); + + static __init int bdi_class_init(void) + { +@@ -246,7 +249,7 @@ static __init int bdi_class_init(void) + if (IS_ERR(bdi_class)) + return PTR_ERR(bdi_class); + +- bdi_class->dev_attrs = bdi_dev_attrs; ++ bdi_class->dev_groups = bdi_dev_groups; + bdi_debug_init(); + return 0; + } |