diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:55:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:55:50 -0700 |
| commit | f768f9d3757be475a20cb5f9d63bda45934150b1 (patch) | |
| tree | b9e5ab5ba84c8434a702723ab80ac6f0f990ce23 /fs/xfs/xfs_dmops.c | |
| parent | 804b908adfcffe3831621acb6c8a776585983d2a (diff) | |
| parent | c6143911a7e0f8abef0319c801eb36718f57dfde (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] cleanup fid types mess
[XFS] fixups after behavior removal merge into mainline git
Diffstat (limited to 'fs/xfs/xfs_dmops.c')
| -rw-r--r-- | fs/xfs/xfs_dmops.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/fs/xfs/xfs_dmops.c b/fs/xfs/xfs_dmops.c index 6cd5704258a2..a1e55fb9d5dd 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); } |