Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Amerigo Wang and committed by
Joel Becker
69a60c4d e2b0c215

+4 -24
+4 -5
Documentation/ABI/obsolete/o2cb Documentation/ABI/removed/o2cb
··· 1 1 What: /sys/o2cb symlink 2 - Date: Dec 2005 3 - KernelVersion: 2.6.16 2 + Date: May 2011 3 + KernelVersion: 2.6.40 4 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 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 7 in /sys/fs/o2cb are sufficiently prevalent. Don't code new 8 8 software to look here, it should try /sys/fs/o2cb instead. 9 - See Documentation/ABI/stable/o2cb for more information on usage. 10 9 Users: ocfs2-tools. It's sufficient to mail proposed changes to 11 10 ocfs2-devel@oss.oracle.com.
-10
Documentation/feature-removal-schedule.txt
··· 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
-9
fs/ocfs2/cluster/sys.c
··· 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 ··· 67 68 o2cb_kset = kset_create_and_add("o2cb", NULL, fs_kobj); 68 69 if (!o2cb_kset) 69 70 return -ENOMEM; 70 - 71 - /* 72 - * Create this symlink for backwards compatibility with old 73 - * versions of ocfs2-tools which look for things in /sys/o2cb. 74 - */ 75 - ret = sysfs_create_link(NULL, &o2cb_kset->kobj, "o2cb"); 76 - if (ret) 77 - goto error; 78 71 79 72 ret = sysfs_create_group(&o2cb_kset->kobj, &o2cb_attr_group); 80 73 if (ret)