Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69a60c4d authored by Amerigo Wang's avatar Amerigo Wang Committed by Joel Becker
Browse files

ocfs2: remove the /sys/o2cb symlink 



It is obsoleted since Dec 2005.

Signed-off-by: default avatarWANG Cong <amwang@redhat.com>
Signed-off-by: default avatarJoel Becker <jlbec@evilplan.org>
parent e2b0c215

Documentation/ABI/obsolete/o2cb→Documentation/ABI/removed/o2cb

+4 −5
Original line number Original line Diff line number Diff line 
What:		/sys/o2cb symlink

What:		/sys/o2cb symlink

Date:		Dec 2005

Date:		May 2011

KernelVersion:	2.6.16

KernelVersion:	2.6.40

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@oss.oracle.com

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is

		be removed when new versions of ocfs2-tools which know to look

		removed when new versions of ocfs2-tools which know to look

		in /sys/fs/o2cb are sufficiently prevalent. Don't code new

		in /sys/fs/o2cb are sufficiently prevalent. Don't code new

		software to look here, it should try /sys/fs/o2cb instead.

		software to look here, it should try /sys/fs/o2cb instead.

		See Documentation/ABI/stable/o2cb for more information on usage.

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.
 
		ocfs2-devel@oss.oracle.com.

Documentation/feature-removal-schedule.txt

+0 −10
Original line number Original line Diff line number Diff line
@@ -262,16 +262,6 @@ Who: Michael Buesch <mb@bu3sch.de> 




---------------------------

---------------------------





What:	/sys/o2cb symlink

When:	January 2010

Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb

	exists as a symlink for backwards compatibility for old versions of

	ocfs2-tools. 2 years should be sufficient time to phase in new versions

	which know to look in /sys/fs/o2cb.

Who:	ocfs2-devel@oss.oracle.com



---------------------------



What:	Ability for non root users to shm_get hugetlb pages based on mlock

What:	Ability for non root users to shm_get hugetlb pages based on mlock

	resource limits

	resource limits

When:	2.6.31

When:	2.6.31

fs/ocfs2/cluster/sys.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ static struct kset *o2cb_kset; 
void o2cb_sys_shutdown(void)

void o2cb_sys_shutdown(void)

{

{

	mlog_sys_shutdown();

	mlog_sys_shutdown();

	sysfs_remove_link(NULL, "o2cb");

	kset_unregister(o2cb_kset);

	kset_unregister(o2cb_kset);

}

}
@@ -69,14 +68,6 @@ int o2cb_sys_init(void) 
	if (!o2cb_kset)

	if (!o2cb_kset)

		return -ENOMEM;

		return -ENOMEM;





	/*

	 * Create this symlink for backwards compatibility with old

	 * versions of ocfs2-tools which look for things in /sys/o2cb.

	 */

	ret = sysfs_create_link(NULL, &o2cb_kset->kobj, "o2cb");

	if (ret)

		goto error;



	ret = sysfs_create_group(&o2cb_kset->kobj, &o2cb_attr_group);

	ret = sysfs_create_group(&o2cb_kset->kobj, &o2cb_attr_group);

	if (ret)

	if (ret)

		goto error;

		goto error;