Commit 69a60c4d177632bd56ae567dc0a082f7119b71c2
Committed by
Joel Becker
Joel Becker
1 parent
e2b0c215c2
Exists in
master
and in
4 other branches
ocfs2: remove the /sys/o2cb symlink
It is obsoleted since Dec 2005. Signed-off-by: WANG Cong <amwang@redhat.com> Signed-off-by: Joel Becker <jlbec@evilplan.org>
Showing 4 changed files with 10 additions and 30 deletions Side-by-side Diff
Documentation/ABI/obsolete/o2cb
| 1 | -What: /sys/o2cb symlink | |
| 2 | -Date: Dec 2005 | |
| 3 | -KernelVersion: 2.6.16 | |
| 4 | -Contact: ocfs2-devel@oss.oracle.com | |
| 5 | -Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will | |
| 6 | - be removed when new versions of ocfs2-tools which know to look | |
| 7 | - in /sys/fs/o2cb are sufficiently prevalent. Don't code new | |
| 8 | - software to look here, it should try /sys/fs/o2cb instead. | |
| 9 | - See Documentation/ABI/stable/o2cb for more information on usage. | |
| 10 | -Users: ocfs2-tools. It's sufficient to mail proposed changes to | |
| 11 | - ocfs2-devel@oss.oracle.com. |
Documentation/ABI/removed/o2cb
| 1 | +What: /sys/o2cb symlink | |
| 2 | +Date: May 2011 | |
| 3 | +KernelVersion: 2.6.40 | |
| 4 | +Contact: ocfs2-devel@oss.oracle.com | |
| 5 | +Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is | |
| 6 | + removed when new versions of ocfs2-tools which know to look | |
| 7 | + in /sys/fs/o2cb are sufficiently prevalent. Don't code new | |
| 8 | + software to look here, it should try /sys/fs/o2cb instead. | |
| 9 | +Users: ocfs2-tools. It's sufficient to mail proposed changes to | |
| 10 | + ocfs2-devel@oss.oracle.com. |
Documentation/feature-removal-schedule.txt
| ... | ... | @@ -262,16 +262,6 @@ |
| 262 | 262 | |
| 263 | 263 | --------------------------- |
| 264 | 264 | |
| 265 | -What: /sys/o2cb symlink | |
| 266 | -When: January 2010 | |
| 267 | -Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb | |
| 268 | - exists as a symlink for backwards compatibility for old versions of | |
| 269 | - ocfs2-tools. 2 years should be sufficient time to phase in new versions | |
| 270 | - which know to look in /sys/fs/o2cb. | |
| 271 | -Who: ocfs2-devel@oss.oracle.com | |
| 272 | - | |
| 273 | ---------------------------- | |
| 274 | - | |
| 275 | 265 | What: Ability for non root users to shm_get hugetlb pages based on mlock |
| 276 | 266 | resource limits |
| 277 | 267 | When: 2.6.31 |
fs/ocfs2/cluster/sys.c
| ... | ... | @@ -57,7 +57,6 @@ |
| 57 | 57 | void o2cb_sys_shutdown(void) |
| 58 | 58 | { |
| 59 | 59 | mlog_sys_shutdown(); |
| 60 | - sysfs_remove_link(NULL, "o2cb"); | |
| 61 | 60 | kset_unregister(o2cb_kset); |
| 62 | 61 | } |
| 63 | 62 | |
| ... | ... | @@ -68,14 +67,6 @@ |
| 68 | 67 | o2cb_kset = kset_create_and_add("o2cb", NULL, fs_kobj); |
| 69 | 68 | if (!o2cb_kset) |
| 70 | 69 | return -ENOMEM; |
| 71 | - | |
| 72 | - /* | |
| 73 | - * Create this symlink for backwards compatibility with old | |
| 74 | - * versions of ocfs2-tools which look for things in /sys/o2cb. | |
| 75 | - */ | |
| 76 | - ret = sysfs_create_link(NULL, &o2cb_kset->kobj, "o2cb"); | |
| 77 | - if (ret) | |
| 78 | - goto error; | |
| 79 | 70 | |
| 80 | 71 | ret = sysfs_create_group(&o2cb_kset->kobj, &o2cb_attr_group); |
| 81 | 72 | if (ret) |