Merge branch 'for-linus' into for-3.1/core

[~andy/linux] / fs / partitions / check.c

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index d545e97d99c3390706894ff1b030c2491a2c0a38..e3c63d1c5e13cc5c520c0d90963ede8ef4baaf8c 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -237,22 +237,22 @@ ssize_t part_size_show(struct device *dev,
        return sprintf(buf, "%llu\n",(unsigned long long)p->nr_sects);
 }
 
-ssize_t part_ro_show(struct device *dev,
-                      struct device_attribute *attr, char *buf)
+static ssize_t part_ro_show(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
        struct hd_struct *p = dev_to_part(dev);
        return sprintf(buf, "%d\n", p->policy ? 1 : 0);
 }
 
-ssize_t part_alignment_offset_show(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
+static ssize_t part_alignment_offset_show(struct device *dev,
+                                         struct device_attribute *attr, char *buf)
 {
        struct hd_struct *p = dev_to_part(dev);
        return sprintf(buf, "%llu\n", (unsigned long long)p->alignment_offset);
 }
 
-ssize_t part_discard_alignment_show(struct device *dev,
-                                  struct device_attribute *attr, char *buf)
+static ssize_t part_discard_alignment_show(struct device *dev,
+                                          struct device_attribute *attr, char *buf)
 {
        struct hd_struct *p = dev_to_part(dev);
        return sprintf(buf, "%u\n", p->discard_alignment);