diff options
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index bdeac3877a84..6ded37b467ff 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
@@ -736,12 +736,13 @@ static int ecryptfs_init_kmem_caches(void) | |||
736 | 736 | ||
737 | static struct kset *ecryptfs_kset; | 737 | static struct kset *ecryptfs_kset; |
738 | 738 | ||
739 | static ssize_t version_show(struct kset *kset, char *buff) | 739 | static ssize_t version_show(struct kobject *kobj, |
740 | struct kobj_attribute *attr, char *buff) | ||
740 | { | 741 | { |
741 | return snprintf(buff, PAGE_SIZE, "%d\n", ECRYPTFS_VERSIONING_MASK); | 742 | return snprintf(buff, PAGE_SIZE, "%d\n", ECRYPTFS_VERSIONING_MASK); |
742 | } | 743 | } |
743 | 744 | ||
744 | static struct subsys_attribute version_attr = __ATTR_RO(version); | 745 | static struct kobj_attribute version_attr = __ATTR_RO(version); |
745 | 746 | ||
746 | static struct ecryptfs_version_str_map_elem { | 747 | static struct ecryptfs_version_str_map_elem { |
747 | u32 flag; | 748 | u32 flag; |
@@ -755,7 +756,8 @@ static struct ecryptfs_version_str_map_elem { | |||
755 | {ECRYPTFS_VERSIONING_MULTKEY, "multiple keys per file"} | 756 | {ECRYPTFS_VERSIONING_MULTKEY, "multiple keys per file"} |
756 | }; | 757 | }; |
757 | 758 | ||
758 | static ssize_t version_str_show(struct kset *kset, char *buff) | 759 | static ssize_t version_str_show(struct kobject *kobj, |
760 | struct kobj_attribute *attr, char *buff) | ||
759 | { | 761 | { |
760 | int i; | 762 | int i; |
761 | int remaining = PAGE_SIZE; | 763 | int remaining = PAGE_SIZE; |
@@ -782,7 +784,7 @@ out: | |||
782 | return total_written; | 784 | return total_written; |
783 | } | 785 | } |
784 | 786 | ||
785 | static struct subsys_attribute version_attr_str = __ATTR_RO(version_str); | 787 | static struct kobj_attribute version_attr_str = __ATTR_RO(version_str); |
786 | 788 | ||
787 | static struct attribute *attributes[] = { | 789 | static struct attribute *attributes[] = { |
788 | &version_attr.attr, | 790 | &version_attr.attr, |