Commit 7d095257 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: kill xfs_qmops 



Kill the quota ops function vector and replace it with direct calls or
stubs in the CONFIG_XFS_QUOTA=n case.

Make sure we check XFS_IS_QUOTA_RUNNING in the right spots.  We can remove
the number of those checks because the XFS_TRANS_DQ_DIRTY flag can't be set
otherwise.

This brings us back closer to the way this code worked in IRIX and earlier
Linux versions, but we keep a lot of the more useful factoring of common
code.

Eventually we should also kill xfs_qm_bhv.c, but that's left for a later
patch.

Reduces the size of the source code by about 250 lines and the size of
XFS module by about 1.5 kilobytes with quotas enabled:

   text	   data	    bss	    dec	    hex	filename
 615957	   2960	   3848	 622765	  980ad	fs/xfs/xfs.o
 617231	   3152	   3848	 624231	  98667	fs/xfs/xfs.o.old

Fallout:

 - xfs_qm_dqattach is split into xfs_qm_dqattach_locked which expects
   the inode locked and xfs_qm_dqattach which does the locking around it,
   thus removing XFS_QMOPT_ILOCKED.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
parent 0c5e1ce8

fs/xfs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ xfs-y += xfs_alloc.o \ 
				   xfs_utils.o \

				   xfs_vnodeops.o \

				   xfs_rw.o \

				   xfs_dmops.o \

				   xfs_qmops.o

				   xfs_dmops.o



xfs-$(CONFIG_XFS_TRACE)		+= xfs_btree_trace.o \

				   xfs_dir2_trace.o

fs/xfs/linux-2.6/xfs_ioctl.c

+13 −11
Original line number Diff line number Diff line
@@ -908,7 +908,8 @@ xfs_ioctl_setattr( 
	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_trans	*tp;

	unsigned int		lock_flags = 0;

	struct xfs_dquot	*udqp = NULL, *gdqp = NULL;

	struct xfs_dquot	*udqp = NULL;

	struct xfs_dquot	*gdqp = NULL;

	struct xfs_dquot	*olddquot = NULL;

	int			code;
@@ -928,7 +929,7 @@ xfs_ioctl_setattr( 
	 * because the i_*dquot fields will get updated anyway.

	 */

	if (XFS_IS_QUOTA_ON(mp) && (mask & FSX_PROJID)) {

		code = XFS_QM_DQVOPALLOC(mp, ip, ip->i_d.di_uid,

		code = xfs_qm_vop_dqalloc(ip, ip->i_d.di_uid,

					 ip->i_d.di_gid, fa->fsx_projid,

					 XFS_QMOPT_PQUOTA, &udqp, &gdqp);

		if (code)
@@ -963,10 +964,11 @@ xfs_ioctl_setattr( 
	 * Do a quota reservation only if projid is actually going to change.

	 */

	if (mask & FSX_PROJID) {

		if (XFS_IS_PQUOTA_ON(mp) &&

		if (XFS_IS_QUOTA_RUNNING(mp) &&

		    XFS_IS_PQUOTA_ON(mp) &&

		    ip->i_d.di_projid != fa->fsx_projid) {

			ASSERT(tp);

			code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,

			code = xfs_qm_vop_chown_reserve(tp, ip, udqp, gdqp,

						capable(CAP_FOWNER) ?

						XFS_QMOPT_FORCE_RES : 0);

			if (code)	/* out of quota */
@@ -1068,8 +1070,8 @@ xfs_ioctl_setattr( 
		 * in the transaction.

		 */

		if (ip->i_d.di_projid != fa->fsx_projid) {

			if (XFS_IS_PQUOTA_ON(mp)) {

				olddquot = XFS_QM_DQVOPCHOWN(mp, tp, ip,

			if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) {

				olddquot = xfs_qm_vop_chown(tp, ip,

							&ip->i_gdquot, gdqp);

			}

			ip->i_d.di_projid = fa->fsx_projid;
@@ -1115,9 +1117,9 @@ xfs_ioctl_setattr( 
	/*

	 * Release any dquot(s) the inode had kept before chown.

	 */

	XFS_QM_DQRELE(mp, olddquot);

	XFS_QM_DQRELE(mp, udqp);

	XFS_QM_DQRELE(mp, gdqp);

	xfs_qm_dqrele(olddquot);

	xfs_qm_dqrele(udqp);

	xfs_qm_dqrele(gdqp);



	if (code)

		return code;
@@ -1131,8 +1133,8 @@ xfs_ioctl_setattr( 
	return 0;



 error_return:

	XFS_QM_DQRELE(mp, udqp);

	XFS_QM_DQRELE(mp, gdqp);

	xfs_qm_dqrele(udqp);

	xfs_qm_dqrele(gdqp);

	xfs_trans_cancel(tp, 0);

	if (lock_flags)

		xfs_iunlock(ip, lock_flags);

fs/xfs/linux-2.6/xfs_super.c

+14 −8
Original line number Diff line number Diff line
@@ -405,6 +405,14 @@ xfs_parseargs( 
		return EINVAL;

	}



#ifndef CONFIG_XFS_QUOTA

	if (XFS_IS_QUOTA_RUNNING(mp)) {

		cmn_err(CE_WARN,

			"XFS: quota support not available in this kernel.");

		return EINVAL;

	}

#endif



	if ((mp->m_qflags & (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE)) &&

	    (mp->m_qflags & (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE))) {

		cmn_err(CE_WARN,
@@ -1098,7 +1106,6 @@ xfs_fs_put_super( 
	xfs_freesb(mp);

	xfs_icsb_destroy_counters(mp);

	xfs_close_devices(mp);

	xfs_qmops_put(mp);

	xfs_dmops_put(mp);

	xfs_free_fsname(mp);

	kfree(mp);
@@ -1168,6 +1175,7 @@ xfs_fs_statfs( 
{

	struct xfs_mount	*mp = XFS_M(dentry->d_sb);

	xfs_sb_t		*sbp = &mp->m_sb;

	struct xfs_inode	*ip = XFS_I(dentry->d_inode);

	__uint64_t		fakeinos, id;

	xfs_extlen_t		lsize;
@@ -1196,7 +1204,10 @@ xfs_fs_statfs( 
	statp->f_ffree = statp->f_files - (sbp->sb_icount - sbp->sb_ifree);

	spin_unlock(&mp->m_sb_lock);



	XFS_QM_DQSTATVFS(XFS_I(dentry->d_inode), statp);

	if ((ip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) ||

	    ((mp->m_qflags & (XFS_PQUOTA_ACCT|XFS_OQUOTA_ENFD))) ==

			      (XFS_PQUOTA_ACCT|XFS_OQUOTA_ENFD))

		xfs_qm_statvfs(ip, statp);

	return 0;

}
@@ -1404,16 +1415,13 @@ xfs_fs_fill_super( 
	error = xfs_dmops_get(mp);

	if (error)

		goto out_free_fsname;

	error = xfs_qmops_get(mp);

	if (error)

		goto out_put_dmops;



	if (silent)

		flags |= XFS_MFSI_QUIET;



	error = xfs_open_devices(mp);

	if (error)

		goto out_put_qmops;

		goto out_put_dmops;



	if (xfs_icsb_init_counters(mp))

		mp->m_flags |= XFS_MOUNT_NO_PERCPU_SB;
@@ -1482,8 +1490,6 @@ xfs_fs_fill_super( 
 out_destroy_counters:

	xfs_icsb_destroy_counters(mp);

	xfs_close_devices(mp);

 out_put_qmops:

	xfs_qmops_put(mp);

 out_put_dmops:

	xfs_dmops_put(mp);

 out_free_fsname:

fs/xfs/linux-2.6/xfs_sync.c

+4 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "xfs_buf_item.h"

#include "xfs_inode_item.h"

#include "xfs_rw.h"

#include "xfs_quota.h"



#include <linux/kthread.h>

#include <linux/freezer.h>
@@ -317,12 +318,12 @@ xfs_quiesce_data( 


	/* push non-blocking */

	xfs_sync_inodes(mp, SYNC_DELWRI|SYNC_BDFLUSH);

	XFS_QM_DQSYNC(mp, SYNC_BDFLUSH);

	xfs_qm_sync(mp, SYNC_BDFLUSH);

	xfs_filestream_flush(mp);



	/* push and block */

	xfs_sync_inodes(mp, SYNC_DELWRI|SYNC_WAIT|SYNC_IOWAIT);

	XFS_QM_DQSYNC(mp, SYNC_WAIT);

	xfs_qm_sync(mp, SYNC_WAIT);



	/* write superblock and hoover up shutdown errors */

	error = xfs_sync_fsdata(mp, 0);
@@ -467,7 +468,7 @@ xfs_sync_worker( 
		xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);

		xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_DELWRI_ELSE_ASYNC);

		/* dgc: errors ignored here */

		error = XFS_QM_DQSYNC(mp, SYNC_BDFLUSH);

		error = xfs_qm_sync(mp, SYNC_BDFLUSH);

		error = xfs_sync_fsdata(mp, SYNC_BDFLUSH);

		if (xfs_log_need_covered(mp))

			error = xfs_commit_dummy_trans(mp, XFS_LOG_FORCE);

fs/xfs/quota/xfs_dquot.c

+3 −1
Original line number Diff line number Diff line
@@ -1194,7 +1194,9 @@ void 
xfs_qm_dqrele(

	xfs_dquot_t	*dqp)

{

	ASSERT(dqp);

	if (!dqp)

		return;



	xfs_dqtrace_entry(dqp, "DQRELE");



	xfs_dqlock(dqp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE