Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[XFS] fixups after behavior removal merge into mainline git 



Fixup for lack of dmapi support and no quota module support.

SGI-PV: 969985

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 4fa4d23f

fs/xfs/xfs_dmops.c

+4 −17
Original line number Diff line number Diff line
@@ -41,29 +41,16 @@ int 
xfs_dmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)

{

	if (args->flags & XFSMNT_DMAPI) {

		struct xfs_dmops *ops;



		ops = symbol_get(xfs_dmcore_xfs);

		if (!ops) {

			request_module("xfs_dmapi");

			ops = symbol_get(xfs_dmcore_xfs);

		}



		if (!ops) {

			cmn_err(CE_WARN, "XFS: no dmapi support available.");

		cmn_err(CE_WARN,

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

		return EINVAL;

	}

		mp->m_dm_ops = ops;

	} else {

		mp->m_dm_ops = &xfs_dmcore_stub;

	}



	mp->m_dm_ops = &xfs_dmcore_stub;

	return 0;

}



void

xfs_dmops_put(struct xfs_mount *mp)

{

	if (mp->m_dm_ops != &xfs_dmcore_stub)

		symbol_put(xfs_dmcore_xfs);

}

fs/xfs/xfs_qmops.c

+7 −15
Original line number Diff line number Diff line
@@ -135,19 +135,13 @@ int 
xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)

{

	if (args->flags & (XFSMNT_UQUOTA | XFSMNT_PQUOTA | XFSMNT_GQUOTA)) {

		struct xfs_qmops *ops;



		ops = symbol_get(xfs_qmcore_xfs);

		if (!ops) {

			request_module("xfs_quota");

			ops = symbol_get(xfs_qmcore_xfs);

		}



		if (!ops) {

			cmn_err(CE_WARN, "XFS: no quota support available.");

#ifdef CONFIG_XFS_QUOTA

		mp->m_qm_ops = &xfs_qmcore_xfs;

#else

		cmn_err(CE_WARN,

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

		return EINVAL;

		}

		mp->m_qm_ops = ops;

#endif

	} else {

		mp->m_qm_ops = &xfs_qmcore_stub;

	}
@@ -158,6 +152,4 @@ xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args) 
void

xfs_qmops_put(struct xfs_mount *mp)

{

	if (mp->m_qm_ops != &xfs_qmcore_stub)

		symbol_put(xfs_qmcore_xfs);

}