Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c8fcfac5a257f8a04f7ba3d397dedccffef19be2
Commit: c8fcfac5a257f8a04f7ba3d397dedccffef19be2
Parent: 4fa4d23fa20de67df919030c1216295664866ad7
Author: Christoph Hellwig <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 19 16:57:01 2007 +1000
Committer: Tim Shimmin <[EMAIL PROTECTED]>
CommitDate: Fri Oct 19 17:14:45 2007 +1000
[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: Christoph Hellwig <[EMAIL PROTECTED]>
Signed-off-by: Tim Shimmin <[EMAIL PROTECTED]>
---
fs/xfs/xfs_dmops.c | 21 ++++-----------------
fs/xfs/xfs_qmops.c | 22 +++++++---------------
2 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c
index 6cd5704..a1e55fb 100644
--- a/fs/xfs/xfs_dmops.c
+++ b/fs/xfs/xfs_dmops.c
@@ -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.");
- return EINVAL;
- }
- mp->m_dm_ops = ops;
- } else {
- mp->m_dm_ops = &xfs_dmcore_stub;
+ cmn_err(CE_WARN,
+ "XFS: dmapi support not available in this kernel.");
+ return EINVAL;
}
+ 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);
}
diff --git a/fs/xfs/xfs_qmops.c b/fs/xfs/xfs_qmops.c
index c266a01..2ec1d8a 100644
--- a/fs/xfs/xfs_qmops.c
+++ b/fs/xfs/xfs_qmops.c
@@ -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.");
- return EINVAL;
- }
- mp->m_qm_ops = ops;
+#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;
+#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);
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
