Commit b09cc771 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tim Shimmin
Browse files

[XFS] remove dependency of the quota module on behaviors 



Mount options are now parsed by the main XFS module and rejected if quota
support is not available, and there are some new quota operation for the
quotactl syscall and calls to quote in the mount, unmount and sync
callchains.

SGI-PV: 969608
SGI-Modid: xfs-linux-melb:xfs-kern:29503a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 293688ec

fs/xfs/linux-2.6/xfs_super.c

+5 −5
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ xfs_fs_quotasync( 
	struct super_block	*sb,

	int			type)

{

	return -bhv_vfs_quotactl(vfs_from_sb(sb), Q_XQUOTASYNC, 0, NULL);

	return -XFS_QM_QUOTACTL(XFS_M(sb), Q_XQUOTASYNC, 0, NULL);

}



STATIC int
@@ -737,7 +737,7 @@ xfs_fs_getxstate( 
	struct super_block	*sb,

	struct fs_quota_stat	*fqs)

{

	return -bhv_vfs_quotactl(vfs_from_sb(sb), Q_XGETQSTAT, 0, (caddr_t)fqs);

	return -XFS_QM_QUOTACTL(XFS_M(sb), Q_XGETQSTAT, 0, (caddr_t)fqs);

}



STATIC int
@@ -746,7 +746,7 @@ xfs_fs_setxstate( 
	unsigned int		flags,

	int			op)

{

	return -bhv_vfs_quotactl(vfs_from_sb(sb), op, 0, (caddr_t)&flags);

	return -XFS_QM_QUOTACTL(XFS_M(sb), op, 0, (caddr_t)&flags);

}



STATIC int
@@ -756,7 +756,7 @@ xfs_fs_getxquota( 
	qid_t			id,

	struct fs_disk_quota	*fdq)

{

	return -bhv_vfs_quotactl(vfs_from_sb(sb),

	return -XFS_QM_QUOTACTL(XFS_M(sb),

				 (type == USRQUOTA) ? Q_XGETQUOTA :

				  ((type == GRPQUOTA) ? Q_XGETGQUOTA :

				   Q_XGETPQUOTA), id, (caddr_t)fdq);
@@ -769,7 +769,7 @@ xfs_fs_setxquota( 
	qid_t			id,

	struct fs_disk_quota	*fdq)

{

	return -bhv_vfs_quotactl(vfs_from_sb(sb),

	return -XFS_QM_QUOTACTL(XFS_M(sb),

				 (type == USRQUOTA) ? Q_XSETQLIM :

				  ((type == GRPQUOTA) ? Q_XSETGQLIM :

				   Q_XSETPQLIM), id, (caddr_t)fdq);

fs/xfs/linux-2.6/xfs_super.h

+3 −0
Original line number Diff line number Diff line
@@ -119,4 +119,7 @@ extern void xfs_blkdev_issue_flush(struct xfs_buftarg *); 


extern struct export_operations xfs_export_operations;



#define XFS_M(sb) \

	XFS_VFSTOM(vfs_from_sb(sb))



#endif	/* __XFS_SUPER_H__ */

fs/xfs/linux-2.6/xfs_vfs.c

+0 −15
Original line number Diff line number Diff line
@@ -155,21 +155,6 @@ vfs_vget( 
	return ((*bhvtovfsops(next)->vfs_vget)(next, vpp, fidp));

}



int

vfs_quotactl(

	struct bhv_desc		*bdp,

	int			cmd,

	int			id,

	caddr_t			addr)

{

	struct bhv_desc		*next = bdp;



	ASSERT(next);

	while (! (bhvtovfsops(next))->vfs_quotactl)

		next = BHV_NEXT(next);

	return ((*bhvtovfsops(next)->vfs_quotactl)(next, cmd, id, addr));

}



void

vfs_init_vnode(

	struct bhv_desc		*bdp,

fs/xfs/linux-2.6/xfs_vfs.h

+0 −5
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ typedef int (*vfs_statvfs_t)(bhv_desc_t *, bhv_statvfs_t *, 
				struct inode *);

typedef int	(*vfs_sync_t)(bhv_desc_t *, int, struct cred *);

typedef int	(*vfs_vget_t)(bhv_desc_t *, struct inode **, struct fid *);

typedef int	(*vfs_quotactl_t)(bhv_desc_t *, int, int, caddr_t);

typedef void	(*vfs_init_vnode_t)(bhv_desc_t *,

				struct inode *, struct xfs_inode *, int);

typedef void	(*vfs_force_shutdown_t)(bhv_desc_t *, int, char *, int);
@@ -144,7 +143,6 @@ typedef struct bhv_vfsops { 
	vfs_statvfs_t		vfs_statvfs;	/* file system statistics */

	vfs_sync_t		vfs_sync;	/* flush files */

	vfs_vget_t		vfs_vget;	/* get vnode from fid */

	vfs_quotactl_t		vfs_quotactl;	/* disk quota */

	vfs_init_vnode_t	vfs_init_vnode;	/* initialize a new vnode */

	vfs_force_shutdown_t	vfs_force_shutdown;	/* crash and burn */

	vfs_freeze_t		vfs_freeze;	/* freeze fs for snapshot */
@@ -163,7 +161,6 @@ typedef struct bhv_vfsops { 
#define bhv_vfs_statvfs(v, sp,vp)	vfs_statvfs(VFSHEAD(v), sp,vp)

#define bhv_vfs_sync(v, flag,cr)	vfs_sync(VFSHEAD(v), flag,cr)

#define bhv_vfs_vget(v, vpp,fidp)	vfs_vget(VFSHEAD(v), vpp,fidp)

#define bhv_vfs_quotactl(v, c,id,p)	vfs_quotactl(VFSHEAD(v), c,id,p)

#define bhv_vfs_init_vnode(v, vp,b,ul)	vfs_init_vnode(VFSHEAD(v), vp,b,ul)

#define bhv_vfs_force_shutdown(v,u,f,l)	vfs_force_shutdown(VFSHEAD(v), u,f,l)

#define bhv_vfs_freeze(v)		vfs_freeze(VFSHEAD(v))
@@ -180,7 +177,6 @@ typedef struct bhv_vfsops { 
#define bhv_next_vfs_statvfs(b, sp,vp)		vfs_statvfs(b, sp,vp)

#define bhv_next_vfs_sync(b, flag,cr)		vfs_sync(b, flag,cr)

#define bhv_next_vfs_vget(b, vpp,fidp)		vfs_vget(b, vpp,fidp)

#define bhv_next_vfs_quotactl(b, c,id,p)	vfs_quotactl(b, c,id,p)

#define bhv_next_vfs_init_vnode(b, vp,b2,ul)	vfs_init_vnode(b, vp,b2,ul)

#define bhv_next_force_shutdown(b, fl,f,l)	vfs_force_shutdown(b, fl,f,l)

#define bhv_next_vfs_freeze(b)			vfs_freeze(b)
@@ -194,7 +190,6 @@ extern int vfs_root(bhv_desc_t *, struct inode **); 
extern int vfs_statvfs(bhv_desc_t *, bhv_statvfs_t *, struct inode *);

extern int vfs_sync(bhv_desc_t *, int, struct cred *);

extern int vfs_vget(bhv_desc_t *, struct inode **, struct fid *);

extern int vfs_quotactl(bhv_desc_t *, int, int, caddr_t);

extern void vfs_init_vnode(bhv_desc_t *, struct inode *, struct xfs_inode *, int);

extern void vfs_force_shutdown(bhv_desc_t *, int, char *, int);

extern void vfs_freeze(bhv_desc_t *);

fs/xfs/quota/xfs_qm.c

+1 −40
Original line number Diff line number Diff line
@@ -287,45 +287,6 @@ xfs_qm_rele_quotafs_ref( 
	XFS_QM_UNLOCK(xfs_Gqm);

}



/*

 * This is called at mount time from xfs_mountfs to initialize the quotainfo

 * structure and start the global quota manager (xfs_Gqm) if it hasn't done

 * so already.	Note that the superblock has not been read in yet.

 */

void

xfs_qm_mount_quotainit(

	xfs_mount_t	*mp,

	uint		flags)

{

	/*

	 * User, projects or group quotas has to be on.

	 */

	ASSERT(flags & (XFSMNT_UQUOTA | XFSMNT_PQUOTA | XFSMNT_GQUOTA));



	/*

	 * Initialize the flags in the mount structure. From this point

	 * onwards we look at m_qflags to figure out if quotas's ON/OFF, etc.

	 * Note that we enforce nothing if accounting is off.

	 * ie.	XFSMNT_*QUOTA must be ON for XFSMNT_*QUOTAENF.

	 * It isn't necessary to take the quotaoff lock to do this; this is

	 * called from mount.

	 */

	if (flags & XFSMNT_UQUOTA) {

		mp->m_qflags |= (XFS_UQUOTA_ACCT | XFS_UQUOTA_ACTIVE);

		if (flags & XFSMNT_UQUOTAENF)

			mp->m_qflags |= XFS_UQUOTA_ENFD;

	}

	if (flags & XFSMNT_GQUOTA) {

		mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE);

		if (flags & XFSMNT_GQUOTAENF)

			mp->m_qflags |= XFS_OQUOTA_ENFD;

	} else if (flags & XFSMNT_PQUOTA) {

		mp->m_qflags |= (XFS_PQUOTA_ACCT | XFS_PQUOTA_ACTIVE);

		if (flags & XFSMNT_PQUOTAENF)

			mp->m_qflags |= XFS_OQUOTA_ENFD;

	}

}



/*

 * Just destroy the quotainfo structure.

 */
@@ -1039,7 +1000,7 @@ xfs_qm_dqdetach( 
int

xfs_qm_sync(

	xfs_mount_t	*mp,

	short		flags)

	int		flags)

{

	int		recl, restarts;

	xfs_dquot_t	*dqp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE