Date: Thu Jul 25 11:50:28 PDT 2002
Workarea: stout.americas.sgi.com:/localhome/src/sandeen/2.5.x-xfs/workarea
Merged by: sandeen
Merged mods: 2.4.x-xfs:slinx:123567a,2.4.x-xfs:slinx:123689a
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.5.x-xfs
Modid: 2.5.x-xfs:slinx:123711a
linux/fs/Makefile - 1.62
linux/fs/Config.in - 1.95
- Merge of 2.4.x-xfs:slinx:123567a originally by roehrich on 07/23/02
From Chris Hellwig:
* CONFIG_XFS_DMAPI is now a dep_mbool on CONFIG_XFS_FS, fs/xfs_dmapi/
is entered based on CONFIG_XFS_FS if CONFIG_XFS_DMAPI is set to keep
the old behaviour.
* CONFIG_HAVE_XFS_DMAPI is gone, as CONFIG_XFS_DMAPI has the same
meaning now.
* we refuse to mount with dmapi/xdsm options now if we can't support
it.
* this way the dmapi_mount vfs method can't be called without dmapi
support anymore. declare the two dmapi-related vfs methods only if
we build with dmapi support.
* fs/xfs/xfsdmapistubs.c is gone, all stubs for XFS-own
dmapi-related functions are inlines in xfs_dmapi.h now.
* xfs_dmapi_mmap_event is renamed to xfs_dm_send_mmap_event to match
the
other xfs_dm_send_* functions
No Message Supplied
linux/fs/xfs/xfs_dmapi.h - 1.29
- Merge of 2.4.x-xfs:slinx:123567a originally by roehrich on 07/23/02
From Chris Hellwig:
* CONFIG_XFS_DMAPI is now a dep_mbool on CONFIG_XFS_FS, fs/xfs_dmapi/
is entered based on CONFIG_XFS_FS if CONFIG_XFS_DMAPI is set to keep
the old behaviour.
* CONFIG_HAVE_XFS_DMAPI is gone, as CONFIG_XFS_DMAPI has the same
meaning now.
* we refuse to mount with dmapi/xdsm options now if we can't support
it.
* this way the dmapi_mount vfs method can't be called without dmapi
support anymore. declare the two dmapi-related vfs methods only if
we build with dmapi support.
* fs/xfs/xfsdmapistubs.c is gone, all stubs for XFS-own
dmapi-related functions are inlines in xfs_dmapi.h now.
* xfs_dmapi_mmap_event is renamed to xfs_dm_send_mmap_event to match
the
other xfs_dm_send_* functions
No Message Supplied
Merge of 2.4.x-xfs:slinx:123689a originally by roehrich on 07/25/02
From Chris Hellwig:
This one removes make the XFS filesystem code independent of the dmapi
headers (include/linux/dmapi.h & include/linux/dmapi_kern.h).
Details:
* include <linux/dmapi.h> and <linux/dmapi_kern.h> in xfs_dmapi.h if
CONFIG_XFS_DMAPI is set instead of unconditionally in xfs.h
* make most of the current contents of xfs_dmapi.h depent on
CONFIG_XFS_DMAPI
* provide stubs for the dmapi functionality in xfs_dmapi.h otherwise
* kill xfs_dmistubs.c
No Message Supplied
linux/fs/xfs/xfs_dmapi.c - 1.79
linux/fs/xfs/Makefile - 1.151
linux/fs/xfs/xfs_vfsops.c - 1.362
linux/fs/xfs/xfsdmapistubs.c - 1.13
- Merge of 2.4.x-xfs:slinx:123567a originally by roehrich on 07/23/02
From Chris Hellwig:
* CONFIG_XFS_DMAPI is now a dep_mbool on CONFIG_XFS_FS, fs/xfs_dmapi/
is entered based on CONFIG_XFS_FS if CONFIG_XFS_DMAPI is set to keep
the old behaviour.
* CONFIG_HAVE_XFS_DMAPI is gone, as CONFIG_XFS_DMAPI has the same
meaning now.
* we refuse to mount with dmapi/xdsm options now if we can't support
it.
* this way the dmapi_mount vfs method can't be called without dmapi
support anymore. declare the two dmapi-related vfs methods only if
we build with dmapi support.
* fs/xfs/xfsdmapistubs.c is gone, all stubs for XFS-own
dmapi-related functions are inlines in xfs_dmapi.h now.
* xfs_dmapi_mmap_event is renamed to xfs_dm_send_mmap_event to match
the
other xfs_dm_send_* functions
No Message Supplied
linux/fs/xfs/linux/xfs_dmistubs.c - 1.20
- Merge of 2.4.x-xfs:slinx:123567a originally by roehrich on 07/23/02
From Chris Hellwig:
* CONFIG_XFS_DMAPI is now a dep_mbool on CONFIG_XFS_FS, fs/xfs_dmapi/
is entered based on CONFIG_XFS_FS if CONFIG_XFS_DMAPI is set to keep
the old behaviour.
* CONFIG_HAVE_XFS_DMAPI is gone, as CONFIG_XFS_DMAPI has the same
meaning now.
* we refuse to mount with dmapi/xdsm options now if we can't support
it.
* this way the dmapi_mount vfs method can't be called without dmapi
support anymore. declare the two dmapi-related vfs methods only if
we build with dmapi support.
* fs/xfs/xfsdmapistubs.c is gone, all stubs for XFS-own
dmapi-related functions are inlines in xfs_dmapi.h now.
* xfs_dmapi_mmap_event is renamed to xfs_dm_send_mmap_event to match
the
other xfs_dm_send_* functions
No Message Supplied
Merge of 2.4.x-xfs:slinx:123689a originally by roehrich on 07/25/02
From Chris Hellwig:
This one removes make the XFS filesystem code independent of the dmapi
headers (include/linux/dmapi.h & include/linux/dmapi_kern.h).
Details:
* include <linux/dmapi.h> and <linux/dmapi_kern.h> in xfs_dmapi.h if
CONFIG_XFS_DMAPI is set instead of unconditionally in xfs.h
* make most of the current contents of xfs_dmapi.h depent on
CONFIG_XFS_DMAPI
* provide stubs for the dmapi functionality in xfs_dmapi.h otherwise
* kill xfs_dmistubs.c
No Message Supplied
linux/fs/xfs/linux/xfs_file.c - 1.76
linux/fs/xfs/linux/xfs_super.h - 1.26
linux/fs/xfs/linux/xfs_super.c - 1.212
- Merge of 2.4.x-xfs:slinx:123567a originally by roehrich on 07/23/02
From Chris Hellwig:
* CONFIG_XFS_DMAPI is now a dep_mbool on CONFIG_XFS_FS, fs/xfs_dmapi/
is entered based on CONFIG_XFS_FS if CONFIG_XFS_DMAPI is set to keep
the old behaviour.
* CONFIG_HAVE_XFS_DMAPI is gone, as CONFIG_XFS_DMAPI has the same
meaning now.
* we refuse to mount with dmapi/xdsm options now if we can't support
it.
* this way the dmapi_mount vfs method can't be called without dmapi
support anymore. declare the two dmapi-related vfs methods only if
we build with dmapi support.
* fs/xfs/xfsdmapistubs.c is gone, all stubs for XFS-own
dmapi-related functions are inlines in xfs_dmapi.h now.
* xfs_dmapi_mmap_event is renamed to xfs_dm_send_mmap_event to match
the
other xfs_dm_send_* functions
No Message Supplied
linux/fs/xfs/xfs.h - 1.28
- Merge of 2.4.x-xfs:slinx:123689a originally by roehrich on 07/25/02
From Chris Hellwig:
This one removes make the XFS filesystem code independent of the dmapi
headers (include/linux/dmapi.h & include/linux/dmapi_kern.h).
Details:
* include <linux/dmapi.h> and <linux/dmapi_kern.h> in xfs_dmapi.h if
CONFIG_XFS_DMAPI is set instead of unconditionally in xfs.h
* make most of the current contents of xfs_dmapi.h depent on
CONFIG_XFS_DMAPI
* provide stubs for the dmapi functionality in xfs_dmapi.h otherwise
* kill xfs_dmistubs.c
No Message Supplied
linux/fs/Config.help - 1.17
|