diff options
| author | Dave Chinner <dchinner@redhat.com> | 2014-06-25 06:57:22 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-06-25 06:57:22 +0200 |
| commit | 69116a1317ce3d2292e062bfb1a22757b95dcd06 (patch) | |
| tree | eae7363c9e70d9364882390b5b4730f49f12c6cd /fs/xfs | |
| parent | xfs: Nuke XFS_ERROR macro (diff) | |
| download | linux-69116a1317ce3d2292e062bfb1a22757b95dcd06.tar.xz linux-69116a1317ce3d2292e062bfb1a22757b95dcd06.zip | |
xfs: create libxfs infrastructure
To minimise the differences between kernel and userspace code,
split the kernel code into the same structure as the userspace code.
That is, the gneric core functionality of XFS is moved to a libxfs/
directory and treat it as a layering barrier in the XFS code.
This patch introduces the libxfs directory, the build infrastructure
and an initial source and header file to build. The libxfs directory
will contain the header files that are needed to build libxfs - most
of userspace does not care about the location of these header files
as they are accessed indirectly. Hence keeping them inside libxfs
makes it easy to track the changes and script the sync process as
the directory structure will be identical.
To allow this changeover to occur in the kernel code, there are some
temporary infrastructure in the makefiles to grab the header
filesystem from both locations. Once all the files are moved,
modifications will be made in the source code that will make the
need for these include directives go away.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/Makefile | 7 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_sb.c (renamed from fs/xfs/xfs_sb.c) | 0 | ||||
| -rw-r--r-- | fs/xfs/libxfs/xfs_sb.h (renamed from fs/xfs/xfs_sb.h) | 0 |
3 files changed, 6 insertions, 1 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index c21f43506661..4c5edf0df9a3 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -17,6 +17,7 @@ # ccflags-y += -I$(src) # needed for trace events +ccflags-y += -I$(src)/libxfs ccflags-$(CONFIG_XFS_DEBUG) += -g @@ -25,6 +26,11 @@ obj-$(CONFIG_XFS_FS) += xfs.o # this one should be compiled first, as the tracing macros can easily blow up xfs-y += xfs_trace.o +# build the libxfs code first +xfs-y += $(addprefix libxfs/, \ + xfs_sb.o \ + ) + # highlevel code xfs-y += xfs_aops.o \ xfs_attr_inactive.o \ @@ -82,7 +88,6 @@ xfs-y += xfs_alloc.o \ xfs_inode_buf.o \ xfs_log_recover.o \ xfs_log_rlimit.o \ - xfs_sb.o \ xfs_symlink_remote.o \ xfs_trans_resv.o diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c index 06ad60b4b9fd..06ad60b4b9fd 100644 --- a/fs/xfs/xfs_sb.c +++ b/fs/xfs/libxfs/xfs_sb.c diff --git a/fs/xfs/xfs_sb.h b/fs/xfs/libxfs/xfs_sb.h index c43c2d609a24..c43c2d609a24 100644 --- a/fs/xfs/xfs_sb.h +++ b/fs/xfs/libxfs/xfs_sb.h |