Commit 10cc04f5 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: (138 commits)
  ocfs2: Access the right buffer_head in ocfs2_merge_rec_left.
  ocfs2: use min_t in ocfs2_quota_read()
  ocfs2: remove unneeded lvb casts
  ocfs2: Add xattr support checking in init_security
  ocfs2: alloc xattr bucket in ocfs2_xattr_set_handle
  ocfs2: calculate and reserve credits for xattr value in mknod
  ocfs2/xattr: fix credits calculation during index create
  ocfs2/xattr: Always updating ctime during xattr set.
  ocfs2/xattr: Remove extend_trans call and add its credits from the beginning
  ocfs2/dlm: Fix race during lockres mastery
  ocfs2/dlm: Fix race in adding/removing lockres' to/from the tracking list
  ocfs2/dlm: Hold off sending lockres drop ref message while lockres is migrating
  ocfs2/dlm: Clean up errors in dlm_proxy_ast_handler()
  ocfs2/dlm: Fix a race between migrate request and exit domain
  ocfs2: One more hamming code optimization.
  ocfs2: Another hamming code optimization.
  ocfs2: Don't hand-code xor in ocfs2_hamming_encode().
  ocfs2: Enable metadata checksums.
  ocfs2: Validate superblock with checksum and ecc.
  ocfs2: Checksum and ECC for directory blocks.
  ...
parents 520c8534 9047beab

Documentation/filesystems/ocfs2.txt

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ Features which OCFS2 does not support yet: 
	- quotas

	- Directory change notification (F_NOTIFY)

	- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)

	- POSIX ACLs



Mount options

=============
@@ -79,3 +78,5 @@ inode64 Indicates that Ocfs2 is allowed to create inodes at 
			bits of significance.

user_xattr	(*)	Enables Extended User Attributes.

nouser_xattr		Disables Extended User Attributes.

acl			Enables POSIX Access Control Lists support.

noacl		(*)	Disables POSIX Access Control Lists support.

fs/Kconfig

+12 −6
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ config OCFS2_FS 
	select CONFIGFS_FS

	select JBD2

	select CRC32

	select QUOTA

	select QUOTA_TREE

	help

	  OCFS2 is a general purpose extent based shared disk cluster file

	  system with many similarities to ext3. It supports 64 bit inode
@@ -258,15 +260,14 @@ config OCFS2_DEBUG_FS 
	  this option for debugging only as it is likely to decrease

	  performance of the filesystem.



config OCFS2_COMPAT_JBD

	bool "Use JBD for compatibility"

config OCFS2_FS_POSIX_ACL

	bool "OCFS2 POSIX Access Control Lists"

	depends on OCFS2_FS

	select FS_POSIX_ACL

	default n

	select JBD

	help

	  The ocfs2 filesystem now uses JBD2 for its journalling.  JBD2

	  is backwards compatible with JBD.  It is safe to say N here.

	  However, if you really want to use the original JBD, say Y here.

	  Posix Access Control Lists (ACLs) support permissions for users and

	  groups beyond the owner/group/world scheme.



endif # BLOCK
@@ -303,6 +304,10 @@ config PRINT_QUOTA_WARNING 
	  Note that this behavior is currently deprecated and may go away in

	  future. Please use notification via netlink socket instead.



# Generic support for tree structured quota files. Seleted when needed.

config QUOTA_TREE

	 tristate



config QFMT_V1

	tristate "Old quota format support"

	depends on QUOTA
@@ -314,6 +319,7 @@ config QFMT_V1 
config QFMT_V2

	tristate "Quota format v2 support"

	depends on QUOTA

	select QUOTA_TREE

	help

	  This quota format allows using quotas with 32-bit UIDs/GIDs. If you

	  need this functionality say Y here.

fs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ obj-$(CONFIG_GENERIC_ACL) += generic_acl.o 
obj-$(CONFIG_QUOTA)		+= dquot.o

obj-$(CONFIG_QFMT_V1)		+= quota_v1.o

obj-$(CONFIG_QFMT_V2)		+= quota_v2.o

obj-$(CONFIG_QUOTA_TREE)	+= quota_tree.o

obj-$(CONFIG_QUOTACTL)		+= quota.o



obj-$(CONFIG_PROC_FS)		+= proc/

fs/dquot.c

+303 −133

File changed.

Preview size limit exceeded, changes collapsed.

fs/ext3/super.c

+7 −9
Original line number Diff line number Diff line
@@ -713,7 +713,9 @@ static struct dquot_operations ext3_quota_operations = { 
	.acquire_dquot	= ext3_acquire_dquot,

	.release_dquot	= ext3_release_dquot,

	.mark_dirty	= ext3_mark_dquot_dirty,

	.write_info	= ext3_write_info

	.write_info	= ext3_write_info,

	.alloc_dquot	= dquot_alloc,

	.destroy_dquot	= dquot_destroy,

};



static struct quotactl_ops ext3_qctl_operations = {
@@ -1035,8 +1037,7 @@ static int parse_options (char *options, struct super_block *sb, 
		case Opt_grpjquota:

			qtype = GRPQUOTA;

set_qf_name:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			if (sb_any_quota_loaded(sb) &&

			    !sbi->s_qf_names[qtype]) {

				printk(KERN_ERR

					"EXT3-fs: Cannot change journaled "
@@ -1075,8 +1076,7 @@ set_qf_name: 
		case Opt_offgrpjquota:

			qtype = GRPQUOTA;

clear_qf_name:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			if (sb_any_quota_loaded(sb) &&

			    sbi->s_qf_names[qtype]) {

				printk(KERN_ERR "EXT3-fs: Cannot change "

					"journaled quota options when "
@@ -1095,8 +1095,7 @@ clear_qf_name: 
		case Opt_jqfmt_vfsv0:

			qfmt = QFMT_VFS_V0;

set_qf_format:

			if ((sb_any_quota_enabled(sb) ||

			     sb_any_quota_suspended(sb)) &&

			if (sb_any_quota_loaded(sb) &&

			    sbi->s_jquota_fmt != qfmt) {

				printk(KERN_ERR "EXT3-fs: Cannot change "

					"journaled quota options when "
@@ -1115,8 +1114,7 @@ set_qf_format: 
			set_opt(sbi->s_mount_opt, GRPQUOTA);

			break;

		case Opt_noquota:

			if (sb_any_quota_enabled(sb) ||

			    sb_any_quota_suspended(sb)) {

			if (sb_any_quota_loaded(sb)) {

				printk(KERN_ERR "EXT3-fs: Cannot change quota "

					"options when quota turned on.\n");

				return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE