To make userspace merges easier, we really need to separate code that exists purely in the kernel code from code that is used by both usrespace and kernel code. This reduces the differences between the userspace and kernel code, and makes it easier to maintain. This patch series sits on top of my current patch queue as posted here: http://oss.sgi.com/archives/xfs/2012-04/msg00768.html The biggest change in the this series is to separate the busy extent list code from xfs_alloc.c. The busy extent code is not needed in userspace whilst the rest of the allocation code is, so it makes sense to move it to it;s own file in the kernel code. Similarly, xfs_rw.[ch] do not exist in userspace, but there are includes all over the place for it in .c files that are shared with userspace. We can trivially kill the xfs_rw.[ch] files in the kernel altogether, removing another trivial difference between user and kernel space. Other header file cleanups are performed - moving xfs_agino_t to xfs_types.h removes a lot of needless dependencies, as does making the static inline function xfs_fsb_to_db a just a normal function in a .c file. _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs