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

Commit e675349e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (64 commits)
  ocfs2/net: Add debug interface to o2net
  ocfs2: Only build ocfs2/dlm with the o2cb stack module
  ocfs2/cluster: Get rid of arguments to the timeout routines
  ocfs2: Put tree in MAINTAINERS
  ocfs2: Use BUG_ON
  ocfs2: Convert ocfs2 over to unlocked_ioctl
  ocfs2: Improve rename locking
  fs/ocfs2/aops.c: test for IS_ERR rather than 0
  ocfs2: Add inode stealing for ocfs2_reserve_new_inode
  ocfs2: Add ac_alloc_slot in ocfs2_alloc_context
  ocfs2: Add a new parameter for ocfs2_reserve_suballoc_bits
  ocfs2: Enable cross extent block merge.
  ocfs2: Add support for cross extent block
  ocfs2: Move /sys/o2cb to /sys/fs/o2cb
  sysfs: Allow removal of symlinks in the sysfs root
  ocfs2:  Reconnect after idle time out.
  ocfs2/dlm: Cleanup lockres print
  ocfs2/dlm: Fix lockname in lockres print function
  ocfs2/dlm: Move dlm_print_one_mle() from dlmmaster.c to dlmdebug.c
  ocfs2/dlm: Dumps the purgelist into a debugfs file
  ...
parents ef38ff9d 2309e9e0

Documentation/ABI/obsolete/o2cb

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
What:		/sys/o2cb symlink

Date:		Dec 2005

KernelVersion:	2.6.16

Contact:	ocfs2-devel@oss.oracle.com

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

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

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

		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

		ocfs2-devel@oss.oracle.com.

Documentation/ABI/stable/o2cb

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
What:		/sys/fs/o2cb/ (was /sys/o2cb)

Date:		Dec 2005

KernelVersion:	2.6.16

Contact:	ocfs2-devel@oss.oracle.com

Description:	Ocfs2-tools looks at 'interface-revision' for versioning

		information. Each logmask/ file controls a set of debug prints

		and can be written into with the strings "allow", "deny", or

		"off". Reading the file returns the current state.

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

		ocfs2-devel@oss.oracle.com.

Documentation/ABI/testing/sysfs-ocfs2

0 → 100644
+89 −0
Original line number Original line Diff line number Diff line 
What:		/sys/fs/ocfs2/

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Description:

		The /sys/fs/ocfs2 directory contains knobs used by the

		ocfs2-tools to interact with the filesystem.



What:		/sys/fs/ocfs2/max_locking_protocol

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Description:

		The /sys/fs/ocfs2/max_locking_protocol file displays version

		of ocfs2 locking supported by the filesystem.  This version

		covers how ocfs2 uses distributed locking between cluster

		nodes.



		The protocol version has a major and minor number.  Two

		cluster nodes can interoperate if they have an identical

		major number and an overlapping minor number - thus,

		a node with version 1.10 can interoperate with a node

		sporting version 1.8, as long as both use the 1.8 protocol.



		Reading from this file returns a single line, the major

		number and minor number joined by a period, eg "1.10".



		This file is read-only.  The value is compiled into the

		driver.



What:		/sys/fs/ocfs2/loaded_cluster_plugins

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Description:

		The /sys/fs/ocfs2/loaded_cluster_plugins file describes

		the available plugins to support ocfs2 cluster operation.

		A cluster plugin is required to use ocfs2 in a cluster.

		There are currently two available plugins:



		* 'o2cb' - The classic o2cb cluster stack that ocfs2 has

			used since its inception.

		* 'user' - A plugin supporting userspace cluster software

			in conjunction with fs/dlm.



		Reading from this file returns the names of all loaded

		plugins, one per line.



		This file is read-only.  Its contents may change as

		plugins are loaded or removed.



What:		/sys/fs/ocfs2/active_cluster_plugin

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Description:

		The /sys/fs/ocfs2/active_cluster_plugin displays which

		cluster plugin is currently in use by the filesystem.

		The active plugin will appear in the loaded_cluster_plugins

		file as well.  Only one plugin can be used at a time.



		Reading from this file returns the name of the active plugin

		on a single line.



		This file is read-only.  Which plugin is active depends on

		the cluster stack in use.  The contents may change

		when all filesystems are unmounted and the cluster stack

		is changed.



What:		/sys/fs/ocfs2/cluster_stack

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Description:

		The /sys/fs/ocfs2/cluster_stack file contains the name

		of current ocfs2 cluster stack.  This value is set by

		userspace tools when bringing the cluster stack online.



		Cluster stack names are 4 characters in length.



		When the 'o2cb' cluster stack is used, the 'o2cb' cluster

		plugin is active.  All other cluster stacks use the 'user'

		cluster plugin.



		Reading from this file returns the name of the current

		cluster stack on a single line.



		Writing a new stack name to this file changes the current

		cluster stack unless there are mounted ocfs2 filesystems.

		If there are mounted filesystems, attempts to change the

		stack return an error.



Users:

	ocfs2-tools <ocfs2-tools-devel@oss.oracle.com>

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Original line Diff line number Diff line
@@ -318,3 +318,13 @@ Why: Not used in-tree. The current out-of-tree users used it to 
	code / infrastructure should be in the kernel and not in some

	code / infrastructure should be in the kernel and not in some

	out-of-tree driver.

	out-of-tree driver.

Who:	Thomas Gleixner <tglx@linutronix.de>

Who:	Thomas Gleixner <tglx@linutronix.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

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -2952,6 +2952,7 @@ P: Joel Becker 
M:	joel.becker@oracle.com

M:	joel.becker@oracle.com

L:	ocfs2-devel@oss.oracle.com

L:	ocfs2-devel@oss.oracle.com

W:	http://oss.oracle.com/projects/ocfs2/

W:	http://oss.oracle.com/projects/ocfs2/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git

S:	Supported

S:	Supported





OMNIKEY CARDMAN 4000 DRIVER

OMNIKEY CARDMAN 4000 DRIVER