Commit 2c9e15a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6: (27 commits)
  ext2: Zero our b_size in ext2_quota_read()
  trivial: fix typos/grammar errors in fs/Kconfig
  quota: Coding style fixes
  quota: Remove superfluous inlines
  quota: Remove uppercase aliases for quota functions.
  nfsd: Use lowercase names of quota functions
  jfs: Use lowercase names of quota functions
  udf: Use lowercase names of quota functions
  ufs: Use lowercase names of quota functions
  reiserfs: Use lowercase names of quota functions
  ext4: Use lowercase names of quota functions
  ext3: Use lowercase names of quota functions
  ext2: Use lowercase names of quota functions
  ramfs: Remove quota call
  vfs: Use lowercase names of quota functions
  quota: Remove dqbuf_t and other cleanups
  quota: Remove NODQUOT macro
  quota: Make global quota locks cacheline aligned
  quota: Move quota files into separate directory
  ext4: quota reservation for delayed allocation
  ...
parents 805de022 c16831b4

fs/Kconfig

+1 −55
Original line number Diff line number Diff line
@@ -56,61 +56,7 @@ endif # BLOCK 


source "fs/notify/Kconfig"



config QUOTA

	bool "Quota support"

	help

	  If you say Y here, you will be able to set per user limits for disk

	  usage (also called disk quotas). Currently, it works for the

	  ext2, ext3, and reiserfs file system. ext3 also supports journalled

	  quotas for which you don't need to run quotacheck(8) after an unclean

	  shutdown.

	  For further details, read the Quota mini-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>, or the documentation provided

	  with the quota tools. Probably the quota support is only useful for

	  multi user systems. If unsure, say N.



config QUOTA_NETLINK_INTERFACE

	bool "Report quota messages through netlink interface"

	depends on QUOTA && NET

	help

	  If you say Y here, quota warnings (about exceeding softlimit, reaching

	  hardlimit, etc.) will be reported through netlink interface. If unsure,

	  say Y.



config PRINT_QUOTA_WARNING

	bool "Print quota warnings to console (OBSOLETE)"

	depends on QUOTA

	default y

	help

	  If you say Y here, quota warnings (about exceeding softlimit, reaching

	  hardlimit, etc.) will be printed to the process' controlling terminal.

	  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

	help

	  This quota format was (is) used by kernels earlier than 2.4.22. If

	  you have quota working and you don't want to convert to new quota

	  format say Y here.



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.



config QUOTACTL

	bool

	depends on XFS_QUOTA || QUOTA

	default y

source "fs/quota/Kconfig"



source "fs/autofs/Kconfig"

source "fs/autofs4/Kconfig"

fs/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -51,11 +51,7 @@ obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o xattr_acl.o 
obj-$(CONFIG_NFS_COMMON)	+= nfs_common/

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-y				+= quota/



obj-$(CONFIG_PROC_FS)		+= proc/

obj-y				+= partitions/

fs/attr.c

+2 −1
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ int notify_change(struct dentry * dentry, struct iattr * attr) 
		if (!error) {

			if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||

			    (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))

				error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;

				error = vfs_dq_transfer(inode, attr) ?

					-EDQUOT : 0;

			if (!error)

				error = inode_setattr(inode, attr);

		}

fs/ext2/balloc.c

+4 −4
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ do_more: 
error_return:

	brelse(bitmap_bh);

	release_blocks(sb, freed);

	DQUOT_FREE_BLOCK(inode, freed);

	vfs_dq_free_block(inode, freed);

}



/**
@@ -1247,7 +1247,7 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	/*

	 * Check quota for allocation of this block.

	 */

	if (DQUOT_ALLOC_BLOCK(inode, num)) {

	if (vfs_dq_alloc_block(inode, num)) {

		*errp = -EDQUOT;

		return 0;

	}
@@ -1409,7 +1409,7 @@ allocated: 


	*errp = 0;

	brelse(bitmap_bh);

	DQUOT_FREE_BLOCK(inode, *count-num);

	vfs_dq_free_block(inode, *count-num);

	*count = num;

	return ret_block;
@@ -1420,7 +1420,7 @@ out: 
	 * Undo the block allocation

	 */

	if (!performed_allocation)

		DQUOT_FREE_BLOCK(inode, *count);

		vfs_dq_free_block(inode, *count);

	brelse(bitmap_bh);

	return 0;

}

fs/ext2/ialloc.c

+5 −5
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ void ext2_free_inode (struct inode * inode) 
	if (!is_bad_inode(inode)) {

		/* Quota is already initialized in iput() */

		ext2_xattr_delete_inode(inode);

	    	DQUOT_FREE_INODE(inode);

		DQUOT_DROP(inode);

		vfs_dq_free_inode(inode);

		vfs_dq_drop(inode);

	}



	es = EXT2_SB(sb)->s_es;
@@ -586,7 +586,7 @@ got: 
		goto fail_drop;

	}



	if (DQUOT_ALLOC_INODE(inode)) {

	if (vfs_dq_alloc_inode(inode)) {

		err = -EDQUOT;

		goto fail_drop;

	}
@@ -605,10 +605,10 @@ got: 
	return inode;



fail_free_drop:

	DQUOT_FREE_INODE(inode);

	vfs_dq_free_inode(inode);



fail_drop:

	DQUOT_DROP(inode);

	vfs_dq_drop(inode);

	inode->i_flags |= S_NOQUOTA;

	inode->i_nlink = 0;

	unlock_new_inode(inode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE