Commit 29bd17af 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: (31 commits)
  ocfs2: clean up bh null checks
  ocfs2: document access rules for blocked_lock_list
  configfs: file.c fix possible recursive locking
  configfs: dir.c fix possible recursive locking
  configfs: Remove EXPERIMENTAL
  ocfs2: bump version number
  ocfs2/dlm: Clear joining_node on hearbeat node down
  ocfs2: convert byte order of constant instead of variable
  ocfs2: Update default cluster timeouts
  ocfs2: printf fixes
  ocfs2: Use generic_file_llseek
  ocfs2: Safer read_inline_data()
  ocfs2: Silence false lockdep warnings
  [PATCH 2/2] ocfs2: cluster aware flock()
  [PATCH 1/2] ocfs2: add flock lock type
  ocfs2: Local alloc window size changeable via mount option
  ocfs2: Support commit= mount option
  ocfs2: Add missing permission checks
  [PATCH 2/2] ocfs2: Implement group add for online resize
  [PATCH 1/2] ocfs2: Add group extend for online resize
  ...
parents 2ba14a01 2fe5c1d7

Documentation/filesystems/ocfs2.txt

+15 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ Features which OCFS2 does not support yet: 
	- Directory change notification (F_NOTIFY)

	- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)

	- POSIX ACLs

	- readpages / writepages (not user visible)



Mount options

=============
@@ -62,3 +61,18 @@ data=writeback Data ordering is not preserved, data may be written 
preferred_slot=0(*)	During mount, try to use this filesystem slot first. If

			it is in use by another node, the first empty one found

			will be chosen. Invalid values will be ignored.

commit=nrsec	(*)	Ocfs2 can be told to sync all its data and metadata

			every 'nrsec' seconds. The default value is 5 seconds.

			This means that if you lose your power, you will lose

			as much as the latest 5 seconds of work (your

			filesystem will not be damaged though, thanks to the

			journaling).  This default value (or any low value)

			will hurt performance, but it's good for data-safety.

			Setting it to 0 will have the same effect as leaving

			it at the default (5 seconds).

			Setting it to very large values will improve

			performance.

localalloc=8(*)		Allows custom localalloc size in MB. If the value is too

			large, the fs will silently revert it to the default.

			Localalloc is not enabled for local mounts.

localflocks		This disables cluster aware flock.

Documentation/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ Code Seq# Include File Comments 
'm'	00-1F	net/irda/irmod.h	conflict!

'n'	00-7F	linux/ncp_fs.h

'n'	E0-FF	video/matrox.h          matroxfb

'o'	00-1F	fs/ocfs2/ocfs2_fs.h	OCFS2

'p'	00-0F	linux/phantom.h		conflict! (OpenHaptics needs this)

'p'	00-3F	linux/mc146818rtc.h	conflict!

'p'	40-7F	linux/nvram.h

fs/Kconfig

+4 −10
Original line number Diff line number Diff line
@@ -440,14 +440,8 @@ config OCFS2_FS 
	  Tools web page:      http://oss.oracle.com/projects/ocfs2-tools

	  OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/



	  Note: Features which OCFS2 does not support yet:

	          - extended attributes

	          - quotas

	          - cluster aware flock

	          - Directory change notification (F_NOTIFY)

	          - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)

	          - POSIX ACLs

	          - readpages / writepages (not user visible)

	  For more information on OCFS2, see the file

	  <file:Documentation/filesystems/ocfs2.txt>.



config OCFS2_DEBUG_MASKLOG

	bool "OCFS2 logging support"
@@ -1028,8 +1022,8 @@ config HUGETLB_PAGE 
	def_bool HUGETLBFS



config CONFIGFS_FS

	tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"

	depends on SYSFS && EXPERIMENTAL

	tristate "Userspace-driven configuration filesystem"

	depends on SYSFS

	help

	  configfs is a ram-based filesystem that provides the converse

	  of sysfs's functionality. Where sysfs is a filesystem-based

fs/configfs/dir.c

+3 −2
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int populate_groups(struct config_group *group) 
		 * That said, taking our i_mutex is closer to mkdir

		 * emulation, and shouldn't hurt.

		 */

		mutex_lock(&dentry->d_inode->i_mutex);

		mutex_lock_nested(&dentry->d_inode->i_mutex, I_MUTEX_CHILD);



		for (i = 0; group->default_groups[i]; i++) {

			new_group = group->default_groups[i];
@@ -1405,7 +1405,8 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys) 
	sd = configfs_sb->s_root->d_fsdata;

	link_group(to_config_group(sd->s_element), group);



	mutex_lock(&configfs_sb->s_root->d_inode->i_mutex);

	mutex_lock_nested(&configfs_sb->s_root->d_inode->i_mutex,

			I_MUTEX_PARENT);



	name.name = group->cg_item.ci_name;

	name.len = strlen(name.name);

fs/configfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int configfs_add_file(struct dentry * dir, const struct configfs_attribute * att 
	umode_t mode = (attr->ca_mode & S_IALLUGO) | S_IFREG;

	int error = 0;



	mutex_lock(&dir->d_inode->i_mutex);

	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_NORMAL);

	error = configfs_make_dirent(parent_sd, NULL, (void *) attr, mode, type);

	mutex_unlock(&dir->d_inode->i_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE