korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[XFS] fixups after behavior removal merge into mainline git

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

SGI-PV: 969985

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Christoph Hellwig 2007-10-19 16:57:01 +10:00 committed by Tim Shimmin
parent 4fa4d23fa2
commit c8fcfac5a2
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/xfs/xfs_dmops.c
View File

@ -41,29 +41,16 @@ int
xfs_dmops_get(struct xfs_mount *mp, struct xfs_mount_args *args) xfs_dmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
{ {
if (args->flags & XFSMNT_DMAPI) { if (args->flags & XFSMNT_DMAPI) {
struct xfs_dmops *ops; cmn_err(CE_WARN,
"XFS: dmapi support not available in this kernel.");
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.");
return EINVAL; return EINVAL;
} }
mp->m_dm_ops = ops;
} else {
mp->m_dm_ops = &xfs_dmcore_stub;
}
mp->m_dm_ops = &xfs_dmcore_stub;
return 0; return 0;
} }
void void
xfs_dmops_put(struct xfs_mount *mp) xfs_dmops_put(struct xfs_mount *mp)
{ {
if (mp->m_dm_ops != &xfs_dmcore_stub)
symbol_put(xfs_dmcore_xfs);
} }

20
fs/xfs/xfs_qmops.c
View File

@ -135,19 +135,13 @@ int
xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args) xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
{ {
if (args->flags & (XFSMNT_UQUOTA | XFSMNT_PQUOTA | XFSMNT_GQUOTA)) { if (args->flags & (XFSMNT_UQUOTA | XFSMNT_PQUOTA | XFSMNT_GQUOTA)) {
struct xfs_qmops *ops; #ifdef CONFIG_XFS_QUOTA
mp->m_qm_ops = &xfs_qmcore_xfs;
ops = symbol_get(xfs_qmcore_xfs); #else
if (!ops) { cmn_err(CE_WARN,
request_module("xfs_quota"); "XFS: qouta support not available in this kernel.");
ops = symbol_get(xfs_qmcore_xfs);
}
if (!ops) {
cmn_err(CE_WARN, "XFS: no quota support available.");
return EINVAL; return EINVAL;
} #endif
mp->m_qm_ops = ops;
} else { } else {
mp->m_qm_ops = &xfs_qmcore_stub; mp->m_qm_ops = &xfs_qmcore_stub;
} }
@ -158,6 +152,4 @@ xfs_qmops_get(struct xfs_mount *mp, struct xfs_mount_args *args)
void void
xfs_qmops_put(struct xfs_mount *mp) xfs_qmops_put(struct xfs_mount *mp)
{ {
if (mp->m_qm_ops != &xfs_qmcore_stub)
symbol_put(xfs_qmcore_xfs);
} }