diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/btrfs/sysfs.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/btrfs/sysfs.c')
| -rw-r--r-- | fs/btrfs/sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index a240b6fa81df..4ce16ef702a3 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c | |||
| @@ -164,12 +164,12 @@ static void btrfs_root_release(struct kobject *kobj) | |||
| 164 | complete(&root->kobj_unregister); | 164 | complete(&root->kobj_unregister); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | static struct sysfs_ops btrfs_super_attr_ops = { | 167 | static const struct sysfs_ops btrfs_super_attr_ops = { |
| 168 | .show = btrfs_super_attr_show, | 168 | .show = btrfs_super_attr_show, |
| 169 | .store = btrfs_super_attr_store, | 169 | .store = btrfs_super_attr_store, |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | static struct sysfs_ops btrfs_root_attr_ops = { | 172 | static const struct sysfs_ops btrfs_root_attr_ops = { |
| 173 | .show = btrfs_root_attr_show, | 173 | .show = btrfs_root_attr_show, |
| 174 | .store = btrfs_root_attr_store, | 174 | .store = btrfs_root_attr_store, |
| 175 | }; | 175 | }; |