]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Bill O'Donnel <billodo@sgi.com> |
2 | Subject: xfs/dmapi: fix crash on mount | |
3 | References: bnc#458027 | |
4 | ||
5 | This patch resolves a crash on mount problem with dmapi, relating to an | |
6 | errant search and replace. | |
7 | ||
8 | Acked-by: Jeff Mahoney <jeffm@suse.com> | |
9 | --- | |
10 | ||
11 | fs/dmapi/dmapi_private.h | 4 ++-- | |
12 | fs/xfs/xfs_dmops.c | 1 - | |
13 | 2 files changed, 2 insertions(+), 3 deletions(-) | |
14 | ||
15 | --- a/fs/dmapi/dmapi_private.h 2009-01-14 17:19:28.000000000 -0600 | |
16 | +++ b/fs/dmapi/dmapi_private.h 2009-01-22 10:32:34.344811347 -0600 | |
17 | @@ -37,8 +37,8 @@ | |
18 | #include "sv.h" | |
19 | ||
20 | #ifdef CONFIG_PROC_FS | |
21 | -#define DMAPI_PROCFS "orig/fs/dmapi_v2" /* DMAPI device in /proc. */ | |
22 | -#define DMAPI_DBG_PROCFS "orig/fs/dmapi_d" /* DMAPI debugging dir */ | |
23 | +#define DMAPI_PROCFS "fs/dmapi_v2" /* DMAPI device in /proc. */ | |
24 | +#define DMAPI_DBG_PROCFS "fs/dmapi_d" /* DMAPI debugging dir */ | |
25 | #endif | |
26 | ||
27 | extern struct kmem_cache *dm_fsreg_cachep; | |
28 | --- a/fs/xfs/xfs_dmops.c 2009-01-14 17:19:30.000000000 -0600 | |
29 | +++ b/fs/xfs/xfs_dmops.c 2009-01-22 10:32:27.888692190 -0600 | |
30 | @@ -58,7 +58,6 @@ | |
31 | mp->m_dm_ops = &xfs_dmcore_stub; | |
32 | } | |
33 | ||
34 | - mp->m_dm_ops = &xfs_dmcore_stub; | |
35 | return 0; | |
36 | } | |
37 |